Changeset 4e5fa43 in tol

Timestamp:

Nov 9, 2009, 3:19:56 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

38b5031

Parents:

b0c13fe

Message:

Reducing cost of ClassifyColumnByRank

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

File:

• tol_pkg/GisTools/_GisTools.tol (modified) (1 diff)

tol_pkg/GisTools/_GisTools.tol

@@ -77 +77 @@
   Set rnk = SetOfReal(min)<<rankBound<<SetOfReal(max);
   VMatrix class = Zeros(m,1);
+  VMatrix vM = Mat2VMat(M);
   Real r = 1;
+  VMatrix constant = Rand(m,1,1,1);
   While(r<=R+1,
   {
-    Matrix  left  = Rand(m,1,rnk[r  ],rnk[r  ]);
-    Matrix  right = Rand(m,1,rnk[r+1],rnk[r+1]);
-    VMatrix left.match = Mat2VMat(LE(left,M));
-    VMatrix right.match = Mat2VMat(LT(M,right));
+    VMatrix left.match = LE(constant*rnk[r],vM);
+    VMatrix right.match = LT(vM,constant*rnk[r+1]);
     VMatrix class := class + And(left.match,right.match)*r;
     Real r := r+1