Changeset 40752 for branches/eam_branches/ohana.20190329/src/opihi/cmd.data/threshold.c

Timestamp:

May 25, 2019, 8:59:46 AM (7 years ago)

Author:

eugene

Message:

add functions to fit a sigmoid to a vector and to match two vectors in 1D; allow vtransitions to be restricted to a value range

File:

• branches/eam_branches/ohana.20190329/src/opihi/cmd.data/threshold.c (modified) (2 diffs)

branches/eam_branches/ohana.20190329/src/opihi/cmd.data/threshold.c

@@ -25 +25 @@
     remove_argument (N, &argc, argv);
     BinMax = atoi (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  float ValMin = NAN;
+  float ValMax = NAN;
+  if ((N = get_argument (argc, argv, "-vrange"))) {
+    remove_argument (N, &argc, argv);
+    ValMin = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+    ValMax = atof (argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -62 +72 @@
     }
     if (BinMax < 0) BinMax += vecx[0].Nelements;
+  }
+
+  // ValMin, ValMax not compatible with BinMin, BinMax
+  if (isfinite(ValMin)) {
+    int binTest = ohana_bisection_double (vecx[0].elements.Flt, vecx[0].Nelements, ValMin);
+    BinMin = (vecx[0].elements.Flt[binTest+1] == ValMin) ? binTest : binTest + 1;
+    // XXX dangerous: check that this does not run off the end, etc
+  }
+  if (isfinite(ValMax)) {
+    int binTest = ohana_bisection_double (vecx[0].elements.Flt, vecx[0].Nelements, ValMax);
+    BinMax = (vecx[0].elements.Flt[binTest+1] == ValMax) ? binTest : binTest + 1;
+    // XXX dangerous: check that this does not run off the end, etc
   }