Changeset 69fede85 in tol

Timestamp:

Nov 13, 2009, 4:10:32 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

5af2e15

Parents:

cc77af9

Message:

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

Location:

tol_pkg

Files:

• GraphTools/test/define.random.graph.tol (modified) (2 diffs)
• GraphTools/test/test_0001/test.tol (modified) (2 diffs)
• MatQuery/test/test_0001/test.tol (modified) (1 diff)
• MatQuery/test/test_0002/test.tol (modified) (2 diffs)

tol_pkg/GraphTools/test/define.random.graph.tol

@@ -15 +15 @@
 
 Real If(ObjectExist("Real","vertex.num"), vertex.num, 
-  vertex.num = IntRand(2,100) );
+  vertex.num = IntRand(2,1000) );
 Real If(ObjectExist("Real","edge.num"), edge.num, 
-  edge.num = IntRand(1,(vertex.num)^1.6) );
+  edge.num = IntRand(1,(vertex.num)^1.5) );
 Real If(ObjectExist("Real","directed"), directed, 
  directed = IntRand(0,1) );
@@ -41 +41 @@
 Real graph::_.edge::add.feature.numeric("Hight");
 
-Matrix data = 
+VMatrix data = Mat2VMat(
   { InOut  = RandCombination(edge.num,vertex.num,2) } |
   { Length = Rand(edge.num, 1, 10, 100) } |
-  { Hight  = Rand(edge.num, 1,  1,  10) };
+  { Hight  = Rand(edge.num, 1,  1,  10) });
 
 Real graph::edge.build(data,removeRepeatedEdges);

tol_pkg/GraphTools/test/test_0001/test.tol

@@ -14 +14 @@
 Real removeRepeatedEdges = True;
 
-#Require GraphTools;
+  #Require GraphTools;
+//#Embed "../../../_embed_all.tol";
+
 #Embed "../define.random.graph.tol";
 
@@ -57 +59 @@
 });
 
-Real high = MatDat(data,edge.idx,4);
+Real high = VMatDat(data,edge.idx,4);
 Real high.1 = graph::get.edge.feature(edge.idx,4);
 Real high.2 = graph::get.edge.feature(edge.idx,"Hight");

tol_pkg/MatQuery/test/test_0001/test.tol

@@ -18 +18 @@
 WriteLn("Current Random Seed = "<<rndSeed);
 
-#Require MatQuery;
+  #Require MatQuery;
+//#Embed "../../../_embed_all.tol";
 
 //The order of magnitude required for number of geographic points

tol_pkg/MatQuery/test/test_0002/test.tol

@@ -13 +13 @@
 Real numWar0 = Copy(NWarning);
 
-#Require MatQuery;
+  #Require MatQuery;
+//#Embed "../../../_embed_all.tol";
 
 Real t1 = Copy(Time);
@@ -28 +29 @@
 WriteLn("Quantile time "<<(t2-t1)+" seconds");
 
-WriteLn("ClassifyColumnByRank over edge's length... ");
+WriteLn("ClassifyRowsByRank over edge's length... ");
 VMatrix length.class = MatQuery::ClassifyRowsByRank(Length, q);
 Real t3 = Copy(Time);
-WriteLn("ClassifyColumnByRank time "<<(t3-t2)+" seconds");
+WriteLn("ClassifyRowsByRank time "<<(t3-t2)+" seconds");
 
 Real q.select = IntRand(2,Card(q)-1);