Changeset 28003 for branches/pap/ippToPsps/src/ippToPsps.c

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippToPsps/src/ippToPsps.c (modified) (7 diffs)

branches/pap/ippToPsps/src/ippToPsps.c

@@ -18 +18 @@
 #include "ippToPsps.h"
 
+extern int ippToPsps_batchTest(IppToPsps *data);
 extern int ippToPsps_batchInit(IppToPsps *data);
 extern int ippToPsps_batchDetection(IppToPsps *data);
@@ -123 +124 @@
 }
 
-// the available IPP data products
+// the available IPP batch types for PSPS
 typedef enum {
 
-    PRODUCT_INIT,
-    PRODUCT_DETECTION,
-    PRODUCT_STACK,
-    PRODUCT_DIFFERENCE,
-    PRODUCT_UNDEFINED
+    BATCH_TEST,
+    BATCH_INIT,
+    BATCH_DETECTION,
+    BATCH_STACK,
+    BATCH_DIFFERENCE,
+    BATCH_UNDEFINED
 
 } ippProducts;
@@ -146 +148 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-results", 0, "Path to results output", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-config", 0, "Path to config dir", NULL);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-product", 0, "Product type: [det|stack|diff]", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-batch", 0, "Product type: [det|stack|diff]", NULL);
 
     bool ret = true;
@@ -163 +165 @@
         this->fitsOutPath = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-output"));
         this->configsDir = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-config"));
-        tmp = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-product"));
-
-        if (!tmp) this->product = PRODUCT_UNDEFINED;
-        else if (strcmp(tmp, "init") == 0) this->product = PRODUCT_INIT;
-        else if (strcmp(tmp, "det") == 0) this->product = PRODUCT_DETECTION;
-        else if (strcmp(tmp, "stack") == 0) this->product = PRODUCT_STACK;
-        else if (strcmp(tmp, "diff") == 0) this->product = PRODUCT_DIFFERENCE;
-        else this->product = PRODUCT_UNDEFINED;
+        tmp = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-batch"));
+
+        if (!tmp) this->batchType = BATCH_UNDEFINED;
+        else if (strcmp(tmp, "test") == 0) this->batchType = BATCH_TEST;
+        else if (strcmp(tmp, "init") == 0) this->batchType = BATCH_INIT;
+        else if (strcmp(tmp, "det") == 0) this->batchType = BATCH_DETECTION;
+        else if (strcmp(tmp, "stack") == 0) this->batchType = BATCH_STACK;
+        else if (strcmp(tmp, "diff") == 0) this->batchType = BATCH_DIFFERENCE;
+        else this->batchType = BATCH_UNDEFINED;
 
         if (
-                (this->product != PRODUCT_INIT && !this->fitsInPath) || 
-                (this->product != PRODUCT_INIT && !this->resultsPath) || 
-                (this->product != PRODUCT_INIT && this->expId == -1) ||
+                (this->batchType != BATCH_INIT && !this->fitsInPath) || 
+                (this->batchType != BATCH_INIT && !this->resultsPath) || 
+                (this->batchType != BATCH_INIT && this->expId == -1) ||
                 !this->fitsOutPath || 
                 !this->configsDir || 
-                this->product == PRODUCT_UNDEFINED ) {
+                this->batchType == BATCH_UNDEFINED ) {
 
             usage(this,argv[0], arguments);
@@ -196 +199 @@
     if(this->exitCode == PS_EXIT_SUCCESS) {
 
-        // which product?
-        switch(this->product) {
-
-            case PRODUCT_INIT:
+        // which batchType?
+        switch(this->batchType) {
+
+            case BATCH_TEST:
+                this->exitCode = ippToPsps_batchTest(this);
+                break;
+            case BATCH_INIT:
                 this->exitCode = ippToPsps_batchInit(this);
                 break;
-            case PRODUCT_DETECTION:
+            case BATCH_DETECTION:
                 this->exitCode = ippToPsps_batchDetection(this);
                 break;
-            case PRODUCT_STACK:
+            case BATCH_STACK:
                 this->exitCode = ippToPsps_batchStack(this);
                 break;
-            case PRODUCT_DIFFERENCE:
+            case BATCH_DIFFERENCE:
                 this->exitCode = ippToPsps_batchDifference(this);
                 break;
             default:
-                psError(PS_ERR_UNKNOWN, false, "Unable to run for this product type (%d)", this->product);
+                psError(PS_ERR_UNKNOWN, false, "Unable to run for this batch type (%d)", this->batchType);
                 this->exitCode = false;
                 break;
@@ -260 +266 @@
     }
 
-    if (this->product != PRODUCT_INIT && !ippToPsps_readInputFilePaths(this)) {
+    if (this->batchType != BATCH_INIT && !ippToPsps_readInputFilePaths(this)) {
 
         this->exitCode = PS_EXIT_DATA_ERROR;
@@ -266 +272 @@
     }
 
-    if (this->product == PRODUCT_INIT)
+    if (this->batchType == BATCH_TEST)
+        psStringAppend(&this->configsDir, "/test");
+    if (this->batchType == BATCH_INIT)
         psStringAppend(&this->configsDir, "/init");
-    if (this->product == PRODUCT_DETECTION)
+    if (this->batchType == BATCH_DETECTION)
         psStringAppend(&this->configsDir, "/detection");
-    if (this->product == PRODUCT_DIFFERENCE)
+    if (this->batchType == BATCH_DIFFERENCE)
         psStringAppend(&this->configsDir, "/diff");
-    if (this->product == PRODUCT_STACK)
+    if (this->batchType == BATCH_STACK)
         psStringAppend(&this->configsDir, "/stack");