Changeset 1463b2e in tol

Timestamp:

Dec 10, 2009, 11:03:28 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

f7f325b

Parents:

cbeed2c

Message:

New optional argument of built-in function Sort to allow unique results

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1775 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/matrix_type/matgra.cpp (modified) (5 diffs)

tol/btol/matrix_type/matgra.cpp

@@ -6553 +6553 @@
   static const BArray<int>*   criterium_;
  public:
-  static int Compare(const void* v1, const void* v2)
-  {
-    int i1 = *(int*)v1;
-    int i2 = *(int*)v2;
+  static int CompareValue(int i1, int i2)
+  {
     int k,j,h;
     for(k=0; k<criterium_->Size(); k++)
@@ -6580 +6578 @@
     return(0);
   }
+  static int Compare(int i1, int i2)
+  {
+    int cmp = CompareValue(i1,i2);
+    if(!cmp) { cmp = i1-i2;}
+    return(cmp);
+  }
+
+  static int Compare(const void* v1, const void* v2)
+  {
+    return(Compare(*(int*)v1,*(int*)v2));
+  }
   static void Sort(const BMatrix<BDat>& mat, 
             const BArray<int>& criterium,
@@ -6601 +6610 @@
   //--------------------------------------------------------------------
   DeclareContensClass(BMat, BMatTemporary, BMatSort);
-  DefExtOpr(1, BMatSort, "Sort", 2, 2, "Matrix Set",
-  "(Matrix mat, Set criterium)",
+  DefExtOpr(1, BMatSort, "Sort", 2, 3, "Matrix Set Real",
+  "(Matrix mat, Set criterium [, Real unique])",
   I2("Sorts rows of a matrix given a mixed criterium of ascent or "
      "descent columns. For example, criterium=[[-2,3]] sorts by 2-nd "
@@ -6620 +6629 @@
   BMat& m = Mat(Arg(1));
   BSet& c = Set(Arg(2));
+  bool unique = false;
+  if(Arg(3))
+  {
+    unique = Real(Arg(3))!=0.0;
+  }
   BArray<int> c_(c.Card());
   BArray<int> p(m.Rows());
-  contens_.Alloc(m.Rows(),1);
   int j,k;
   bool ok=true;
@@ -6646 +6659 @@
   }
   BMatOrder::Sort(m,c_,p);
-  for(k=0;k<m.Rows();k++)
-  {
-    contens_(k,0)=p[k]+1;
-  }
-}
+  if(!unique)
+  {
+    contens_.Alloc(m.Rows(),1);
+    for(k=0;k<m.Rows();k++)
+    {
+      contens_(k,0)=p[k]+1;
+    }
+  }
+  else
+  {
+    int d=1;
+    BArray<int> cmp(m.Rows());
+    cmp[0]=1;
+    for(k=1;k<m.Rows();k++)
+    {
+      if(cmp[k]=BMatOrder::CompareValue(p[k-1],p[k])) { d++; }
+    }
+    contens_.Alloc(d,1);
+    for(k=d=0;k<m.Rows();k++)
+    {
+      if(cmp[k]) 
+      { 
+        contens_(d,0)=p[k]+1;
+        d++; 
+      }
+    }
+  }
+}
+
 
 //--------------------------------------------------------------------