Changeset 40168

Timestamp:

Oct 15, 2017, 12:27:40 PM (9 years ago)

Author:

eugene

Message:

change opihi_int from int to long long int

Location:

branches/eam_branches/ohana.20170822/src

Files:

• libdvo/include/dvodb.h (modified) (3 diffs)
• libdvo/src/dbCheckStack.c (modified) (1 diff)
• libohana/include/ohana_sort.h (modified) (1 diff)
• libohana/src/sorts.c (modified) (1 diff)
• opihi/cmd.astro/fitplx.c (modified) (4 diffs)
• opihi/cmd.astro/fitplx_irls.c (modified) (3 diffs)
• opihi/cmd.astro/fitpm.c (modified) (1 diff)
• opihi/cmd.astro/fitpm_irls.c (modified) (1 diff)
• opihi/cmd.data/print_vectors.c (modified) (1 diff)
• opihi/cmd.data/reindex.c (modified) (2 diffs)
• opihi/cmd.data/uniq.c (modified) (1 diff)
• opihi/cmd.data/write_vectors.c (modified) (1 diff)
• opihi/dvo/remote.c (modified) (1 diff)
• opihi/include/astro.h (modified) (1 diff)
• opihi/lib.shell/dvomath.c (modified) (1 diff)
• opihi/lib.shell/evaluate_stack.c (modified) (1 diff)

branches/eam_branches/ohana.20170822/src/libdvo/include/dvodb.h

@@ -3 +3 @@
 
 # define MEASURE_HAS_XCCD 1
+
+// Some values used by code moved to libdvo from opihi.
+enum {OPIHI_NOTYPE, OPIHI_FLT, OPIHI_INT};
+# define opihi_flt double
+// # define opihi_int int64_t
+# define opihi_int long long int
+# define OPIHI_INT_FMT "%lld"
 
 typedef enum {
@@ -471 +478 @@
   char    type;
   int     field;
-  // opihi_flt FltValue;
-  // opihi_int IntValue;
-  double FltValue;
-  int IntValue;
+  opihi_flt FltValue;
+  opihi_int IntValue;
+  // double FltValue;
+  // int IntValue;
 } dbStack;
 
 typedef struct {
-  // opihi_flt Flt;
-  // opihi_int Int;
-  double Flt;
-  int Int;
+  opihi_flt Flt;
+  opihi_int Int;
+  // double Flt;
+  // int Int;
 } dbValue;
 
@@ -562 +569 @@
 int dbExtractImagesReset (void);
 
-// Some values used by code moved to libdvo from opihi.
-enum {OPIHI_NOTYPE, OPIHI_FLT, OPIHI_INT};
-#define opihi_flt double
-#define opihi_int int
-
 #include "get_graphdata.h"
 

branches/eam_branches/ohana.20170822/src/libdvo/src/dbCheckStack.c

@@ -43 +43 @@
        * an int unless proven otherwise **/
       stack[i].FltValue = strtod (stack[i].name, &c1);
-      stack[i].IntValue = strtol (stack[i].name, &c2, 0);
+      stack[i].IntValue = strtoll (stack[i].name, &c2, 0);
       if (c2 == stack[i].name + strlen (stack[i].name)) {
         stack[i].type  |= DB_STACK_INT;

branches/eam_branches/ohana.20170822/src/libohana/include/ohana_sort.h

@@ -68 +68 @@
 void fsort (float *value, int N);
 void isort (int *value, int N);
+void llsort (long long int *value, int N);
 
 void dsortpair (double *X, double *Y, int N);

branches/eam_branches/ohana.20170822/src/libohana/src/sorts.c

@@ -30 +30 @@
 
 # define SWAPFUNC(A,B){ int tmp = value[A]; value[A] = value[B]; value[B] = tmp; }
+# define COMPARE(A,B)(value[A] < value[B])
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}
+
+void llsort (long long int *value, int N) {
+
+# define SWAPFUNC(A,B){ long long int tmp = value[A]; value[A] = value[B]; value[B] = tmp; }
 # define COMPARE(A,B)(value[A] < value[B])
 

branches/eam_branches/ohana.20170822/src/opihi/cmd.astro/fitplx.c

@@ -77 +77 @@
   double *dD = dDvec->elements.Flt;
 
-  int *mask = NULL;
+  opihi_int *mask = NULL;
   if (mvec) {
     mask = mvec->elements.Int;
@@ -380 +380 @@
 }
 
-int PlxSetMeanEpoch (double *R, double *D, double *T, double *Rmean, double *Dmean, double *Tmean, int *mask, int Ntotal) {
+int PlxSetMeanEpoch (double *R, double *D, double *T, double *Rmean, double *Dmean, double *Tmean, opihi_int *mask, int Ntotal) {
 
   int i;
@@ -413 +413 @@
 
 // generate the fit values (projected X,Y; parallax factors; 
-int PlxSetEpochPosition (PlxFitData *fitdata, double *R, double *D, double *dR, double *dD, double *T, int *mask, int Ntotal, Coords *coords, double Tmean) {
+int PlxSetEpochPosition (PlxFitData *fitdata, double *R, double *D, double *dR, double *dD, double *T, opihi_int *mask, int Ntotal, Coords *coords, double Tmean) {
 
   int i;
@@ -464 +464 @@
 # define MAX_REJECT 0.1
 
-int PlxOutlierClip (PlxFitData *fitdata, int *mask, int Noutlier, float dPsigMax, Vector *dPvec, int VERBOSE) {
+int PlxOutlierClip (PlxFitData *fitdata, opihi_int *mask, int Noutlier, float dPsigMax, Vector *dPvec, int VERBOSE) {
 
   int i, n;

branches/eam_branches/ohana.20170822/src/opihi/cmd.astro/fitplx_irls.c

@@ -81 +81 @@
   double *dD = dDvec->elements.Flt;
 
-  int *mask = NULL;
+  opihi_int *mask = NULL;
   if (mvec) {
     mask = mvec->elements.Int;
@@ -109 +109 @@
   for (i = 0; (VERBOSE == 2) && (i < fitdata.Npts); i++) {
     int n = fitdata.index[i];
-    int maskValue = mask ? mask[n] : 1;
-    fprintf (stderr, "%f %f : %f %d : %f %f %f\n", R[n], D[n], T[n], maskValue, fitdata.t[i], fitdata.X[i], fitdata.Y[i]);
+    opihi_int maskValue = mask ? mask[n] : 1;
+    fprintf (stderr, "%f %f : %f "OPIHI_INT_FMT" : %f %f %f\n", R[n], D[n], T[n], maskValue, fitdata.t[i], fitdata.X[i], fitdata.Y[i]);
   }
 
@@ -150 +150 @@
       
       if (VERBOSE == 2) {
-          fprintf (stderr, "%f %f : %f %d : %f %f %f : %f %f %f %f\n", R[n], D[n], T[n], mask[n], fitdata.t[i], fitdata.X[i], fitdata.Y[i], fitdata.Wx[i], fitdata.Wy[i], Sum_Wx, Sum_Wy);
+          fprintf (stderr, "%f %f : %f "OPIHI_INT_FMT" : %f %f %f : %f %f %f %f\n", R[n], D[n], T[n], mask[n], fitdata.t[i], fitdata.X[i], fitdata.Y[i], fitdata.Wx[i], fitdata.Wy[i], Sum_Wx, Sum_Wy);
       }
     }

branches/eam_branches/ohana.20170822/src/opihi/cmd.astro/fitpm.c

@@ -50 +50 @@
   double *dD = dDvec->elements.Flt;
 
-  int *mask = NULL;
+  opihi_int *mask = NULL;
   if (mvec) {
     mask = mvec->elements.Int;

branches/eam_branches/ohana.20170822/src/opihi/cmd.astro/fitpm_irls.c

@@ -58 +58 @@
   double *dD = dDvec->elements.Flt;
 
-  int *mask = NULL;
+  opihi_int *mask = NULL;
   if (mvec) {
     mask = mvec->elements.Int;

branches/eam_branches/ohana.20170822/src/opihi/cmd.data/print_vectors.c

@@ -35 +35 @@
           gprint (GP_LOG, "%f ", vec[i][0].elements.Flt[j]);
         } else {
-          gprint (GP_LOG, "%d ", vec[i][0].elements.Int[j]);
+          gprint (GP_LOG, OPIHI_INT_FMT, vec[i][0].elements.Int[j]);
         }
       }

branches/eam_branches/ohana.20170822/src/opihi/cmd.data/reindex.c

@@ -47 +47 @@
         continue;
       }
-      if (*vx > Nmax) ESCAPE("unexpected value in index: %d (%d)\n", *vx, i);
+      if (*vx > Nmax) ESCAPE("unexpected value in index: "OPIHI_INT_FMT" (%d)\n", *vx, i);
       ovec[0].elements.Flt[Npts] = vi[*vx];
       Npts++;
@@ -67 +67 @@
         continue;
       }
-      if (*vx > Nmax) ESCAPE("unexpected value in index: %d (%d)\n", *vx, i);
+      if (*vx > Nmax) ESCAPE("unexpected value in index: "OPIHI_INT_FMT" (%d)\n", *vx, i);
       ovec[0].elements.Int[Npts] = vi[*vx];
       Npts++;

branches/eam_branches/ohana.20170822/src/opihi/cmd.data/uniq.c

@@ -80 +80 @@
     memcpy (indata, ivec->elements.Int, ivec[0].Nelements*sizeof(opihi_int));
 
-    isort (indata, ivec->Nelements);
+    llsort (indata, ivec->Nelements);
 
     Nnew = 0;

branches/eam_branches/ohana.20170822/src/opihi/cmd.data/write_vectors.c

@@ -165 +165 @@
         } else {
           if (CSV) {
-            fprintf (f, "%d,", vec[j][0].elements.Int[i]);
+            fprintf (f, OPIHI_INT_FMT",", vec[j][0].elements.Int[i]);
           } else {
-            fprintf (f, "%d ", vec[j][0].elements.Int[i]);
+            fprintf (f, OPIHI_INT_FMT" ", vec[j][0].elements.Int[i]);
           }
         }

branches/eam_branches/ohana.20170822/src/opihi/dvo/remote.c

@@ -27 +27 @@
     gprint (GP_ERR, "  -skip-result : do not try to read from the result file\n");
     gprint (GP_ERR, "OR:    remote -reload (uniquer)\n");
+    gprint (GP_ERR, "       (reloads the remote host results into vectors as if a parallel command were run)\n");
     gprint (GP_ERR, "OR:    remote -get-results (uniquer)\n");
+    gprint (GP_ERR, "       (generates the list of remote result filenames and status variables)\n");
+    gprint (GP_ERR, "       (RESULT_FILE:i is the filenme, RESULT_STATUS:i is the dvo_client exit status)\n");
     return FALSE;
   }

branches/eam_branches/ohana.20170822/src/opihi/include/astro.h

@@ -47 +47 @@
 double VectorFractionInterpolate (double *values, float fraction, int Npts);
 
-int PlxSetMeanEpoch (double *R, double *D, double *T, double *Rmean, double *Dmean, double *Tmean, int *mask, int Ntotal);
-int PlxSetEpochPosition (PlxFitData *fitdata, double *R, double *D, double *dR, double *dD, double *T, int *mask, int Ntotal, Coords *coords, double Tmean);
-int PlxOutlierClip (PlxFitData *fitdata, int *mask, int Noutlier, float dPsigMax, Vector *dPvec, int VERBOSE);
+int PlxSetMeanEpoch (double *R, double *D, double *T, double *Rmean, double *Dmean, double *Tmean, opihi_int *mask, int Ntotal);
+int PlxSetEpochPosition (PlxFitData *fitdata, double *R, double *D, double *dR, double *dD, double *T, opihi_int *mask, int Ntotal, Coords *coords, double Tmean);
+int PlxOutlierClip (PlxFitData *fitdata, opihi_int *mask, int Noutlier, float dPsigMax, Vector *dPvec, int VERBOSE);
 
 int PlxFitDataAlloc (PlxFitData *data, int N);

branches/eam_branches/ohana.20170822/src/opihi/lib.shell/dvomath.c

@@ -82 +82 @@
       } else {
         if (stack[0].type == ST_SCALAR_INT) {
-          sprintf (outname, "%d", stack[0].IntValue);
+          sprintf (outname, OPIHI_INT_FMT, stack[0].IntValue);
         } else {
           sprintf (outname, "%.12g", stack[0].FltValue);

branches/eam_branches/ohana.20170822/src/opihi/lib.shell/evaluate_stack.c

@@ -89 +89 @@
       }
       if (tmp_stack.type == ST_SCALAR_INT) {
-        gprint (GP_ERR, "---> %d ", tmp_stack.IntValue);
+        gprint (GP_ERR, "---> "OPIHI_INT_FMT" ", tmp_stack.IntValue);
       }
       if (tmp_stack.type == ST_SCALAR_FLT) {