Changeset 39489

Timestamp:

Mar 28, 2016, 11:03:49 AM (10 years ago)

Author:

eugene

Message:

re-optimize by using bisection instead of a direct index for measure->imageID lookups

Location:

trunk/Ohana/src/dvolens

Files:

• Makefile (modified) (2 diffs)
• include/dvolens.h (modified) (3 diffs)
• src/WarpImageMaps.c (modified) (3 diffs)
• src/myIndex.c (modified) (1 diff)
• src/mySequence.c (added)
• src/select_images.c (modified) (1 diff)
• src/update_objects_catalog.c (modified) (7 diffs)

trunk/Ohana/src/dvolens/Makefile

@@ -33 +33 @@
 $(SRC)/initialize.$(ARCH).o      \
 $(SRC)/myIndex.$(ARCH).o         \
+$(SRC)/mySequence.$(ARCH).o      \
 $(SRC)/update_objects.$(ARCH).o  \
 $(SRC)/update_objects_catalog.$(ARCH).o  \
@@ -52 +53 @@
 $(SRC)/initialize.$(ARCH).o      \
 $(SRC)/myIndex.$(ARCH).o         \
+$(SRC)/mySequence.$(ARCH).o      \
 $(SRC)/update_objects.$(ARCH).o  \
 $(SRC)/update_objects_catalog.$(ARCH).o  \

trunk/Ohana/src/dvolens/include/dvolens.h

@@ -16 +16 @@
   int NINDEX;
 } myIndexType;
+
+// a structure to define a sequence lookup
+typedef struct {
+  int minID;
+  int maxID;
+  int *value;
+  int *sequence;
+  int Nsequence;
+  int NSEQUENCE;
+} mySequenceType;
 
 typedef enum {
@@ -87 +97 @@
 
 int FindWarpGroups (void);
-int RecoverLensingIndex (Average *average, myIndexType *measureIndex, Lensing *lensing);
+int RecoverLensingIndex (Average *average, mySequenceType *measureSeq, Lensing *lensing);
 void FreeWarpGroups (void);
 
@@ -99 +109 @@
 off_t getImageByID (off_t ID);
 
+mySequenceType *mySequenceAlloc ();
+int mySequenceFree (mySequenceType *mySequence);
+int mySequenceSetSize (mySequenceType *mySequence, int Nmax);
+int mySequenceSetValue (mySequenceType *mySequence, int value, int entry);
+int mySequenceSort (mySequenceType *mySequence);
+int mySequenceGetEntry (mySequenceType *mySequence, int value);

trunk/Ohana/src/dvolens/src/WarpImageMaps.c

@@ -204 +204 @@
 }
 
-int RecoverLensingIndex (Average *average, myIndexType *measureIndex, Lensing *lensing) {
+int RecoverLensingIndex (Average *average, mySequenceType *measureSeq, Lensing *lensing) {
 
   // Although the imageID is wrong (no matching measures), the image should be one of the
@@ -240 +240 @@
     int N = warpgroup[seq].warps[i];
 
-    int Mj = myIndexGetEntry (measureIndex, image[N].imageID);
+    int Mj = mySequenceGetEntry (measureSeq, image[N].imageID);
     if (Mj < 0) continue;
 
@@ -258 +258 @@
   for (int i = 0; i < Nwarpgroup; i++) {
     free (warpgroup[i].warps);
-    // free (warpgroup[i].Rmin);
-    // free (warpgroup[i].Rmax);
-    // free (warpgroup[i].Dmin);
-    // free (warpgroup[i].Dmax);
-    // free (warpgroup[i].onBoundary);
+    free (warpgroup[i].Rmin);
+    free (warpgroup[i].Rmax);
+    free (warpgroup[i].Dmin);
+    free (warpgroup[i].Dmax);
+    free (warpgroup[i].onBoundary);
   }    
 

trunk/Ohana/src/dvolens/src/myIndex.c

@@ -18 +18 @@
 int myIndexFree (myIndexType *myIndex) {
 
+  if (!myIndex) return TRUE;
   free (myIndex->index);
   free (myIndex);

trunk/Ohana/src/dvolens/src/select_images.c

@@ -44 +44 @@
   
   // I need to ensure we get the images from any skycells in a warp
-  double dD = 2.0;
+  double dD = 4.0;
   double dR = dD / cos(RAD_DEG*DminSkyRegion);
   RminSkyRegion -= dR;

trunk/Ohana/src/dvolens/src/update_objects_catalog.c

@@ -35 +35 @@
   int Nlensobj = 0;
 
-  myIndexType *measureIndex = myIndexAlloc();
+  mySequenceType *measureSeq = mySequenceAlloc();
 
   int Nfixed = 0;
@@ -41 +41 @@
 
   INITTIME;
-
   double time1 = 0.0;
   double time2 = 0.0;
@@ -49 +48 @@
   for (i = 0; i < catalog->Naverage; i++) {
     
-    if (i % 1000 == 0) {
-      MARKTIME ("done with %d aves: %f sec (%f %f %f %f)\n", (int) i, dtime, time1, time2, time3, time4);
-      time1 = 0.0;
-      time2 = 0.0;
-      time3 = 0.0;
-      time4 = 0.0;
-      gettimeofday (&startTimer, NULL);
-    }
-
     Average *average = &catalog->average[i];
     if (average->Nlensing == 0) continue;
@@ -82 +72 @@
     // I could make an index measureSeq[imageID-imageIDmin]
     
-    myIndexInit (measureIndex);
+    TIMESTAMP (time1);
+
+    mySequenceSetSize (measureSeq, average->Nmeasure);
 
     // generate an index for these measure entries (based on Mj and imageID)
     for (Mj = 0; Mj < average->Nmeasure; Mj++) {
-      myIndexUpdateLimits (measureIndex, catalog->measure[Moff + Mj].imageID);
+      mySequenceSetValue (measureSeq, catalog->measure[Moff + Mj].imageID, Mj);
     }
 
-    TIMESTAMP (time1);
-    myIndexSetRange (measureIndex);
+    mySequenceSort (measureSeq);
+
     TIMESTAMP (time2);
-
-    for (Mj = 0; Mj < average->Nmeasure; Mj++) {
-      // if there are duplicates (multiple measures from the same image), 
-      // myIndexSetEntry will only select one
-      myIndexSetEntry (measureIndex, catalog->measure[Moff + Mj].imageID, Mj);
-    }
 
     // loop over the lensing measurements.  for each one, I need to find the corresponding measurement (make an index in lensing?)
@@ -112 +98 @@
       // XX ALT myAssert (measure->imageID == lensing->imageID, "oops, deux");
 
-      Mj = myIndexGetEntry (measureIndex, lensing->imageID);
+      Mj = mySequenceGetEntry (measureSeq, lensing->imageID);
 
       // if we are unable to find a match in the measure table, we may have the wrong 
@@ -121 +107 @@
       if (Mj < 0) {
         if (REPAIR_LENSING_IDS) {
-          Mj = RecoverLensingIndex (average, measureIndex, lensing);
+          Mj = RecoverLensingIndex (average, measureSeq, lensing);
           if (Mj == -1) {
+            fprintf (stderr, "failed %f %f : %d\n", average->R, average->D, lensing->imageID);
             Nfailed ++;
             continue;
@@ -331 +318 @@
   free (N7);
 
-  myIndexFree (measureIndex);
+  mySequenceFree (measureSeq);
+
+  fprintf (stderr, "done with %d aves (%f %f %f %f)\n", (int) catalog->Naverage, time1, time2, time3, time4);
 
   fprintf (stderr, "corrected %d lensing IDs, failed on %d lensing IDs\n", Nfixed, Nfailed);