Changeset 40174 for branches/eam_branches/ohana.20170822/src/opihi/cmd.data/uniqpair.c

Timestamp:

Oct 16, 2017, 4:31:22 PM (9 years ago)

Author:

eugene

Message:

fix uniqpair, add test for uniqpair

File:

• branches/eam_branches/ohana.20170822/src/opihi/cmd.data/uniqpair.c (modified) (8 diffs)

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

@@ -5 +5 @@
 
   int N;
-  Vector *ID1vec = NULL, *ID2vec = NULL, *SEQvec = NULL, *OUTvec = NULL;
+  Vector *ID1vec = NULL, *ID2vec = NULL, *OUTvec = NULL;
 
   int VERBOSE = FALSE;
@@ -14 +14 @@
 
   Vector *SEQdup = NULL;
-  if ((N = get_argument (argc, argv, "-save-dups"))) {
+  if ((N = get_argument (argc, argv, "-d"))) {
     remove_argument (N, &argc, argv);
     if ((SEQdup = SelectVector (argv[N], ANYVECTOR, TRUE)) == NULL) {
@@ -33 +33 @@
   }
 
-  if (argc != 5) {
-    gprint (GP_ERR, "USAGE: uniqpair (ID1) (ID2) (IDout) -c count\n");
+  if (argc != 4) {
+    gprint (GP_ERR, "USAGE: uniqpair (ID1) (ID2) (IDout) [-c count] [-d dupindex]\n");
+    gprint (GP_ERR, "  merge ID1 and ID2 (32 bit int values) into a single index and find unique entries\n");
+    gprint (GP_ERR, "  -c count: save the number of each unique entry in the count vector\n");
+    gprint (GP_ERR, "  -d dupindex: save the sequence number of duplicate entries in the dupindex vector\n");
     return (FALSE);
   }
@@ -74 +77 @@
   opihi_int *SEQdata = NULL;
   ALLOCATE (IDfull, opihi_int, ID1vec->Nelements);
-  ALLOCATE (SEQdata, opihi_int, SEQvec[0].Nelements);
+  ALLOCATE (SEQdata, opihi_int, ID1vec->Nelements);
   for (int i = 0; i < ID1vec->Nelements; i++) {
     IDfull[i] = ID1[i] + (ID2[i] << 32);
@@ -80 +83 @@
   }
 
-  llsorttwo (IDfull, SEQdata, ID1vec->Nelements);
+  // XXX watch out: this all needs to get rationalized...
+  llsortpair ((off_t *)IDfull, (off_t *)SEQdata, ID1vec->Nelements);
 
   opihi_int *vtgt = OUTvec->elements.Int;
@@ -111 +115 @@
       // we want to save SEQdata values for the duplicates
       // SEQdata[i-Ndup] .. SEQdata[i-N
-      for (j = i - Ndup; j < i; j++) {
+      for (int j = i - Ndup; j < i; j++) {
         SEQdup->elements.Int[NseqDup] = SEQdata[j];
         NseqDup ++;
@@ -129 +133 @@
   if (SEQdup) {
     SEQdup->Nelements = NseqDup;
-    REALLOCATE (SEQdup->elements.Int, opihi_int, Nseqdup);
+    REALLOCATE (SEQdup->elements.Int, opihi_int, NseqDup);
   }
 
@@ -135 +139 @@
   OUTvec->elements.Int = vtgt;
   ResetVector (OUTvec, OPIHI_INT, Nout);
-  if (cvec) ResetVector (cvec, OPIHI_INT, Nout);
+  if (CNTvec) ResetVector (CNTvec, OPIHI_INT, Nout);
 
   return (TRUE);
 }
-
-
-
-}