Changeset 9073

Timestamp:

Sep 29, 2006, 5:13:39 PM (20 years ago)

Author:

jhoblitt

Message:

stub out -tonormalizedexp, -addnormalizedexp, & -normalizedexp
rename -normalized -> -normalizedimfile

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (4 diffs)
• dettool.h (modified) (1 diff)
• dettoolConfig.c (modified) (3 diffs)

trunk/ippTools/src/dettool.c

@@ -32 +32 @@
 static bool normstatMode(pxConfig *config);
 static bool addnormalizedimfileMode(pxConfig *config);
+static bool tonormalizedexpMode(pxConfig *config);
+static bool addnormalizedexpMode(pxConfig *config);
+static bool normalizedexpMode(pxConfig *config);
 static bool toresidMode(pxConfig *config);
 static bool addresidimfileMode(pxConfig *config);
-static bool normalizedMode(pxConfig *config); // needed?
+static bool normalizedimfileMode(pxConfig *config); // needed?
 static bool toresidexpMode(pxConfig *config);
 static bool normalizedframeMode(pxConfig *config);// neede?
@@ -96 +99 @@
         MODECASE(DETTOOL_MODE_NORMSTAT,         normstatMode);
         MODECASE(DETTOOL_MODE_ADDNORMALIZEDIMFILE,addnormalizedimfileMode);
-        MODECASE(DETTOOL_MODE_NORMALIZED,       normalizedMode);
+        MODECASE(DETTOOL_MODE_NORMALIZEDIMFILE, normalizedimfileMode);
+        MODECASE(DETTOOL_MODE_TONORMALIZEDEXP,  tonormalizedexpMode);
+        MODECASE(DETTOOL_MODE_ADDNORMALIZEDEXP, addnormalizedexpMode);
+        MODECASE(DETTOOL_MODE_NORMALIZEDEXP,    normalizedexpMode);
         MODECASE(DETTOOL_MODE_TORESID,          toresidMode);
         MODECASE(DETTOOL_MODE_ADDRESIDIMFILE,   addresidimfileMode);
@@ -2287 +2293 @@
         return false;
     }
+
+    return true;
+}
+
+static bool tonormalizedexpMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    return true;
+}
+
+static bool addnormalizedexpMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    return true;
+}
+
+static bool normalizedexpMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
 
     return true;
@@ -2430 +2457 @@
 }
 
-static bool normalizedMode(pxConfig *config)
+static bool normalizedimfileMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);

trunk/ippTools/src/dettool.h

@@ -27 +27 @@
     DETTOOL_MODE_NORMSTAT,
     DETTOOL_MODE_ADDNORMALIZEDIMFILE,
-    DETTOOL_MODE_NORMALIZED,
+    DETTOOL_MODE_NORMALIZEDIMFILE,
+    DETTOOL_MODE_TONORMALIZEDEXP,
+    DETTOOL_MODE_ADDNORMALIZEDEXP,
+    DETTOOL_MODE_NORMALIZEDEXP,
     DETTOOL_MODE_TORESID,
     DETTOOL_MODE_ADDRESIDIMFILE,

trunk/ippTools/src/dettoolConfig.c

@@ -280 +280 @@
         "define URI (required)", NULL);
 
+    // -tonormalizedexp
+    psMetadata *tonormalizedexpArgs = psMetadataAlloc();
+
+    // -addnormalizedexp
+    psMetadata *addnormalizedexpArgs = psMetadataAlloc();
+
+    // -normalizedexp
+    psMetadata *normalizedexpArgs = psMetadataAlloc();
+ 
     // -toresid
     psMetadata *toresidArgs = psMetadataAlloc();
@@ -285 +294 @@
         "use the simple output format", false);
 
-    // -normalized
-    psMetadata *normalizedArgs = psMetadataAlloc();
-    psMetadataAddStr(normalizedArgs, PS_LIST_TAIL, "-det_id",  0,
+    // -normalizedimfile
+    psMetadata *normalizedimfileArgs = psMetadataAlloc();
+    psMetadataAddStr(normalizedimfileArgs, PS_LIST_TAIL, "-det_id",  0,
         "search for detrend ID (required)", NULL);
-    psMetadataAddS32(normalizedArgs, PS_LIST_TAIL, "-iteration",  0,
+    psMetadataAddS32(normalizedimfileArgs, PS_LIST_TAIL, "-iteration",  0,
         "search for iteration number", 0);
-    psMetadataAddStr(normalizedArgs, PS_LIST_TAIL, "-class_id",  0,
+    psMetadataAddStr(normalizedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
         "search for class ID", NULL);
-    psMetadataAddStr(normalizedArgs, PS_LIST_TAIL, "-recip",  0,
+    psMetadataAddStr(normalizedimfileArgs, PS_LIST_TAIL, "-recip",  0,
         "search for recipe", NULL);
-    psMetadataAddBool(normalizedArgs, PS_LIST_TAIL, "-simple",  0,
+    psMetadataAddBool(normalizedimfileArgs, PS_LIST_TAIL, "-simple",  0,
         "use the simple output format", false);
  
@@ -528 +537 @@
 //    PXTOOL_MODE("-stackedframe",    DETTOOL_MODE_STACKEDFRAME,  stacframeArgs);
     PXTOOL_MODE("-addnormalizedimfile", DETTOOL_MODE_ADDNORMALIZEDIMFILE,addnormalizedimfileArgs);
+    PXTOOL_MODE("-tonormalizedexpArgs", DETTOOL_MODE_TONORMALIZEDEXP, tonormalizedexpArgs);
+    PXTOOL_MODE("-addnormalizedexp", DETTOOL_MODE_ADDNORMALIZEDEXP, addnormalizedexpArgs);
+    PXTOOL_MODE("-normalizedexp",   DETTOOL_MODE_NORMALIZEDEXP, normalizedexpArgs);
     PXTOOL_MODE("-toresid",         DETTOOL_MODE_TORESID,       toresidArgs);
-    PXTOOL_MODE("-normalized",      DETTOOL_MODE_NORMALIZED,    normalizedArgs);
+    PXTOOL_MODE("-normalizedimfile",DETTOOL_MODE_NORMALIZEDIMFILE, normalizedimfileArgs);
     PXTOOL_MODE("-toresidexp",      DETTOOL_MODE_TORESIDEXP,    toresidexpArgs);
 //    PXTOOL_MODE("-normalizedframe", DETTOOL_MODE_NORMALIZEDFRAME,normalizedframeArgs);