Changeset 37105

Timestamp:

Jul 23, 2014, 3:18:08 PM (12 years ago)

Author:

watersc1

Message:

Merge of max_num limit in stacktool from trunk

Location:

tags/ipp-pv3-20140717/ippTools/src

Files:

• stacktool.c (modified) (1 diff, 1 prop)
• stacktoolConfig.c (modified) (1 diff, 1 prop)

tags/ipp-pv3-20140717/ippTools/src/stacktool.c

@@ -260 +260 @@
     // these are used to build the HAVING restriction
     PXOPT_COPY_S32(config->args, having, "-min_num", "num_warp", ">=");
+    PXOPT_COPY_S32(config->args, having, "-max_num", "num_warp", "<=");
+    
     PXOPT_LOOKUP_S32(min_num,     config->args, "-min_num",  false, false);
     if (min_num < 2) {

tags/ipp-pv3-20140717/ippTools/src/stacktoolConfig.c

@@ -98 +98 @@
     psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-random", 0, "use this number of random elements", 0);
     psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-min_num", 0, "minimum number of inputs", 0);
+    psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-max_num", 0, "maximum number of inputs", 0);
     psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-min_new", 0, "minimum number of new inputs", 0);
     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-min_frac", 0, "minumum fraction of new inputs", NAN);