Changeset aa1e2cc in tol for tol_pkg/MatQuery

Timestamp:

Nov 27, 2009, 10:16:22 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

6cea4d2

Parents:

345a4d7

Message:

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

Location:

tol_pkg/MatQuery/test

Files:

• test_0001/test.tol (modified) (6 diffs)
• test_0002/test.tol (modified) (1 diff)
• test_0003/test.tol (modified) (1 diff)

tol_pkg/MatQuery/test/test_0001/test.tol

@@ -9 +9 @@
 Text summary_ = "checking matrix row selection";
 
+  #Require MatQuery;
+//#Embed "../../../_embed_all.tol";
+
 //Write here the initial test TOL code if needed
 Real numErr0 = Copy(NError);
@@ -18 +21 @@
 WriteLn("Current Random Seed = "<<rndSeed);
 
-  #Require MatQuery;
-//#Embed "../../../_embed_all.tol";
 
 //The order of magnitude required for number of geographic points
@@ -69 +70 @@
 VMatrix points = Mat2VMat(BinGroup("<<",city.points));
 
+
 //Target point
 VMatrix p0 = SubRow(points,[[IntRand(1,point.num)]])+
@@ -79 +81 @@
   points, p0, distance);
 VMatrix p0.select.HC = SubRow(points,p0.select.idx.HC);
+
 Real t1 = Copy(Time);
 WriteLn("SelectRowsInHyperCube full "<<VRows(p0.select.HC)+" items "
@@ -88 +91 @@
   points, p0, distance);
 VMatrix p0.select.HE.1 = SubRow(points,p0.select.idx.HE.1);
+
 Real t2 = Copy(Time);
 WriteLn("SelectRowsInHyperSphere full "<<VRows(p0.select.HE.1)+" items "
@@ -106 +110 @@
   Card(p0.select.idx.HE.1   *      p0.select.idx.HC) == 
   Card(p0.select.idx.HE.1));
+
 Real ok.2 = VMatMax(Abs(p0.select.HE.2-p0.select.HE.1))==0;
 

tol_pkg/MatQuery/test/test_0002/test.tol

@@ -9 +9 @@
 Text summary_ = "checking matrix row selection";
 
+  #Require MatQuery;
+//#Embed "../../../_embed_all.tol";
+
 //Write here the initial test TOL code if needed
 Real numErr0 = Copy(NError);
 Real numWar0 = Copy(NWarning);
-
-  #Require MatQuery;
-//#Embed "../../../_embed_all.tol";
 
 Real t1 = Copy(Time);

tol_pkg/MatQuery/test/test_0003/test.tol

@@ -9 +9 @@
 Text summary_ = "checking matrix row selection of unknown values";
 
+//#Require MatQuery;
+//#Embed "../../../_embed_all.tol";
+
 //Write here the initial test TOL code if needed
 Real numErr0 = Copy(NError);
 Real numWar0 = Copy(NWarning);
 
-#Require MatQuery;
-//#Embed "../../../_embed_all.tol";
-
 Real t1 = Copy(Time);
 Real rndSeed = 0;
 Real m = 300;
+Real n = 10;
 
-VMatrix unk.match = LE(Rand(m,1,0,1),Rand(m,1,1,1)*.20);
-VMatrix M = IfVMat(unk.match, Rand(m,1,1,1)*?, Rand(m,1,-10,10));
+VMatrix unk.match = LE(Rand(m,n,0,1),Rand(m,n,1,1)*.20);
+VMatrix M = IfVMat(unk.match, Rand(m,n,1,1)*?, Rand(m,n,-10,10));
 
-VMatrix unk.match_ = MatQuery::MatchRowsWithValue(M,?);
-Real ok.1 = VMatMax(Abs(unk.match-unk.match))==0;
+VMatrix M.unk = Min(IsUnknown(M)*Rand(n,1,1,1), Rand(m,1,1,1));
 
-Set sel.known = MatQuery::SelectMatch(Not(unk.match_));
+VMatrix M.rows.known = Pack(Not(IsUnknown(M)*Rand(n,1,1,1)));
+VMatrix M.rows.unknown = Pack(Not(M.rows.known));
+VMatrix M.rows.known_= MatQuery::MatchRowsFullKnown(M);
 
-VMatrix extract.known = SubRow(M, sel.known);
+VMatrix unk.match.1 = LE(Rand(m,1,0,1),Rand(m,1,1,1)*.20);
+VMatrix M1 = IfVMat(unk.match.1, Rand(m,1,1,1)*?, Rand(m,1,-10,10));
+
+VMatrix unk.match.1_ = MatQuery::MatchRowsWithValue(M1,?);
+Real ok.1 = VMatMax(Abs(unk.match.1-unk.match.1))==0;
+
+Set sel.known = MatQuery::SelectMatch(Not(unk.match.1_));
+
+VMatrix extract.known = SubRow(M1, sel.known);
 
 Real ok.2 = VMatSum(IsUnknown(extract.known))==0;
-Real ok.3 = VRows(extract.known)==m-VMatSum(unk.match);
+Real ok.3 = VRows(extract.known)==m-VMatSum(unk.match.1);