Changeset e7af41b in tol for tol_pkg/GraphTools/test

Timestamp:

Nov 9, 2009, 1:57:31 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

2720097

Parents:

ea1b10f

Message:

Making standard package

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

Location:

tol_pkg/GraphTools/test/test_0001

Files:

• define.random.graph.tol (modified) (3 diffs)
• test.tol (modified) (1 diff)

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

@@ -5 +5 @@
 
 //Random seed setting
-Real PutRandomSeed(0);
-Real rndSeed = GetRandomSeed(0);
+Real If(ObjectExist("Real","rndSeed"), 
+  PutRandomSeed(rndSeed),
+  PutRandomSeed(0));
+Real If(ObjectExist("Real","rndSeed"), rndSeed,
+ rndSeed = GetRandomSeed(0));
+
 WriteLn("Current Random Seed = "<<rndSeed);
 
-Real vertex.num = IntRand(2,1000);
-Real edge.num   = IntRand(1,(vertex.num)^1.6);
-Real directed   = IntRand(0,1);
+
+Real If(ObjectExist("Real","vertex.num"), vertex.num, 
+  vertex.num = IntRand(2,100) );
+Real If(ObjectExist("Real","edge.num"), edge.num, 
+  edge.num = IntRand(1,(vertex.num)^1.6) );
+Real If(ObjectExist("Real","directed"), directed, 
+ directed = IntRand(0,1) );
+Real If(ObjectExist("Real","removeRepeatedEdges"), removeRepeatedEdges, 
+ removeRepeatedEdges = IntRand(0,1) );
 
 WriteLn("Creating "+If(directed,"directed","symmetric")+
@@ -17 +27 @@
         edge.num+" edges ...");
 Real t0 = Copy(Time);
-
 
 GraphTools::@Graph graph = GraphTools::@Graph::New("test_0001",directed);
@@ -37 +46 @@
   { Hight  = Rand(edge.num, 1,  1,  10) };
 
-Real graph::edge.build(data);
+Real graph::edge.build(data,removeRepeatedEdges);
 
+Real t1 = Copy(Time);
+
+WriteLn("Creating time "<<(t1-t0)+" seconds");

tol_pkg/GraphTools/test/test_0001/test.tol

@@ -12 +12 @@
 Real numWar0 = Copy(NWarning);
 
+Real rndSeed = 0;
+Real removeRepeatedEdges = True;
 
 #Embed "../../_GraphTools.tol";