Changeset 37947

Timestamp:

Mar 4, 2015, 2:24:51 PM (11 years ago)

Author:

watersc1

Message:

revert back to the style of difftool warpstack code from before I tried to make it better, as that didn't work.

Location:

trunk/ippTools/src

Files:

• difftool.c (modified) (7 diffs)
• difftool.h (modified) (1 diff)
• difftoolConfig.c (modified) (3 diffs)

trunk/ippTools/src/difftool.c

@@ -42 +42 @@
 static bool definepoprunMode(pxConfig *config);
 static bool definewarpstackMode(pxConfig *config);
-static bool definewarpstackOldMethodMode(pxConfig *config);
+//static bool definewarpstackOldMethodMode(pxConfig *config);
 static bool definewarpwarpMode(pxConfig *config);
 static bool definestackstackMode(pxConfig *config);
@@ -96 +96 @@
         MODECASE(DIFFTOOL_MODE_DEFINEPOPRUN,          definepoprunMode);
         MODECASE(DIFFTOOL_MODE_DEFINEWARPSTACK,       definewarpstackMode);
-        MODECASE(DIFFTOOL_MODE_DEFINEWARPSTACKOLDMETHOD,       definewarpstackOldMethodMode);
+        //      MODECASE(DIFFTOOL_MODE_DEFINEWARPSTACKOLDMETHOD,       definewarpstackOldMethodMode);
         MODECASE(DIFFTOOL_MODE_DEFINEWARPWARP,        definewarpwarpMode);
         MODECASE(DIFFTOOL_MODE_DEFINESTACKSTACK,      definestackstackMode);
@@ -1336 +1336 @@
     return true;
   }
-
-  // Do a pass through the result list to determine which runs should be excluded.
-  // This exclusion should do two things:  If a skycell doesn't have a stack (as we do a LEFT JOIN) now,
-  // then that skycell needs to not be included in the diff.  However, if we have available off,
-  // then we need to flag the entire exposure as bad.
-  psS64 previous_exp_id = 0;
-  long  start_index     = 0;
-  bool  bad_exposure    = false;
-  long  Nskycells       = 0;
-  for (long i = 0; i < output->n; i++) {
-    psMetadata *row = output->data[i];
-    bool mdok;
-    psS64 exp_id = psMetadataLookupS64(&mdok, row, "exp_id");
-    if (!mdok) {
-        psError(PXTOOLS_ERR_PROG, false, "exp_id not found");
-        if (!psDBRollback(config->dbh)) {
-          psError(PS_ERR_UNKNOWN, false, "database error");
-        }
-        return false;
-    }
-
-    if (exp_id != previous_exp_id) { // Save the position of the start of this exposure.
-      if (Nskycells == 0) {  // Ooops, we didn't find any good skycells for this exposure.  Don't make an empty run.
-        for (long j = start_index; j < i; j++) { // Clear all the previous entries for this exposure.
-          psMetadata *old_row = output->data[j];
-          psMetadataAddBool(old_row,PS_LIST_TAIL, "exclude", PS_META_REPLACE, "", true);  // No stack exists, so this row can't be diffed.
-          psMetadataAddBool(old_row,PS_LIST_TAIL, "excludeExp", PS_META_REPLACE, "", true);  // No stack exists, so this row can't be diffed.
-        }
-      }      
-      previous_exp_id = exp_id;
-      start_index = i;
-      bad_exposure = false;
-      Nskycells = 0;
-    }
-
-    if (bad_exposure) { // We've flagged this exposure as bad.
-      psMetadataAddBool(row,PS_LIST_TAIL, "exclude", PS_META_REPLACE, "", true);
-      psMetadataAddBool(row,PS_LIST_TAIL, "excludeExp", PS_META_REPLACE, "", true);
-      continue;
-    }
-
-    psMetadataAddBool(row,PS_LIST_TAIL, "exclude", PS_META_REPLACE, "", false); // By default, this shouldn't be excluded.
-    psMetadataAddBool(row,PS_LIST_TAIL, "excludeExp", PS_META_REPLACE, "", false);
-    
-    psS64 stack_id = psMetadataLookupS64(&mdok, row, "stack_id");
-    if (stack_id == PS_MAX_S64) { // stack_id IS NULL, we cannot make this skycell-level diff
-      psMetadataAddBool(row,PS_LIST_TAIL, "exclude", PS_META_REPLACE, "", true);  // No stack exists, so this row can't be diffed.
-
-      if (!available) { // We want to be strict about everything, so cancel this entire exposure.
-        bad_exposure = true;  // New exposures with this exp_id will be flagged as bad.
-        for (long j = start_index; j < i; j++) { // Clear all the previous entries for this exposure.
-          psMetadata *old_row = output->data[j];
-          psMetadataAddBool(old_row,PS_LIST_TAIL, "exclude", PS_META_REPLACE, "", true);  // No stack exists, so this row can't be diffed.
-          psMetadataAddBool(old_row,PS_LIST_TAIL, "excludeExp", PS_META_REPLACE, "", true);  // No stack exists, so this row can't be diffed.
-        }
-      }
-    }
-    else { // This looks fine.
-      Nskycells++;
-    }
-  }
-  
-
   
   if (pretend) {
@@ -1451 +1388 @@
           return false;
         }
-      }
-
-      // Do exposure level exclusion here.
-      bool excludeExp = psMetadataLookupBool(&mdok, row, "excludeExp");
-      if (!mdok) {
-        psError(PXTOOLS_ERR_PROG, false, "excludeExp not found");
-        if (!psDBRollback(config->dbh)) {
-          psError(PS_ERR_UNKNOWN, false, "database error");
-        }
-        return false;
-      }
-      if (excludeExp) { // The pre-scan determined that no diff should be made for this exposure.
-        continue;
       }
       
@@ -1520 +1444 @@
     
     if (exp_id == last_exp_id) {
-      bool exclude = psMetadataLookupBool(&mdok, row, "exclude");
-      if (!mdok) {
-        psError(PXTOOLS_ERR_PROG, false, "exclude not found");
-        if (!psDBRollback(config->dbh)) {
-          psError(PS_ERR_UNKNOWN, false, "database error");
-        }
-        return false;
-      }
-      if (exclude) { // skip this skycell, as we probably don't have a diff.
-        continue;
-      }
       psString skycell_id = psMetadataLookupStr(&mdok, row, "skycell_id");
       if (!mdok) {
@@ -1614 +1527 @@
 }  
 
-
+#if (0)
 static bool definewarpstackOldMethodMode(pxConfig *config)
 {
@@ -2005 +1918 @@
     return true;
 }
-
+#endif
 
 static bool definewarpwarpMode(pxConfig *config)

trunk/ippTools/src/difftool.h

@@ -54 +54 @@
     DIFFTOOL_MODE_LISTSSRUN,
     DIFFTOOL_MODE_SETSKYFILETOUPDATE,
-    DIFFTOOL_MODE_DEFINEWARPSTACKOLDMETHOD,
+    //    DIFFTOOL_MODE_DEFINEWARPSTACKOLDMETHOD,
 } difftoolMode;
 

trunk/ippTools/src/difftoolConfig.c

@@ -274 +274 @@
     pxspaceBoxAddArguments(definewarpstackArgs);
 
-    
+#if (0)    
     // -definewarpstackOldMethod
     psMetadata *definewarpstackOldMethodArgs = psMetadataAlloc();
@@ -303 +303 @@
 
     pxspaceBoxAddArguments(definewarpstackOldMethodArgs);
-
+#endif
     
     // -definewarpwarp
@@ -511 +511 @@
     PXOPT_ADD_MODE("-definepoprun",     "", DIFFTOOL_MODE_DEFINEPOPRUN,      definepoprunArgs);
     PXOPT_ADD_MODE("-definewarpstack",  "", DIFFTOOL_MODE_DEFINEWARPSTACK,   definewarpstackArgs);
-    PXOPT_ADD_MODE("-definewarpstackOldMethod",  "", DIFFTOOL_MODE_DEFINEWARPSTACKOLDMETHOD,   definewarpstackOldMethodArgs);
+    //    PXOPT_ADD_MODE("-definewarpstackOldMethod",  "", DIFFTOOL_MODE_DEFINEWARPSTACKOLDMETHOD,   definewarpstackOldMethodArgs);
     PXOPT_ADD_MODE("-definewarpwarp",   "", DIFFTOOL_MODE_DEFINEWARPWARP,    definewarpwarpArgs);
     PXOPT_ADD_MODE("-definestackstack", "", DIFFTOOL_MODE_DEFINESTACKSTACK,  definestackstackArgs);