Changeset 2b60aab in tol for tol_pkg

Timestamp:

Nov 7, 2009, 4:41:18 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

4d44f38

Parents:

9642924

Message:

Adding member Set @Graph::get.vertex.names(Real void)

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

Location:

tol_pkg/graphtools

Files:

• graphtools.tol (modified) (1 diff)
• test/test_0001/test.tol (modified) (5 diffs)

tol_pkg/graphtools/graphtools.tol

@@ -304 +304 @@
   {
     _.edge::get.all(idx)
+  };
+
+  ////////////////////////////////////////////////////////////////////////////
+  Set get.vertex.names(Real void)
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    ((_.vertex::_.feature)[1])::_.domain
   }
-
 }
 

tol_pkg/graphtools/test/test_0001/test.tol

@@ -5 +5 @@
 
 Text email_ = "vdebuen@tol-project.org"; 
+Text link_ = ""; 
 Text summary_ = "checking a simple graph";
 
@@ -23 +24 @@
 GraphTools::@Graph graph = GraphTools::@Graph::New("test_0001",True);
 
-Real graph::initialize(Set { vertex.names = For(1,vertex.num,Text(Real k)
+Set vertex.names = For(1,vertex.num,Text(Real k)
 {
-   "Key_"<<FormatReal(k,"0%6.0f")<<
+   "Key_"<<FormatReal(k,"%06.0f")<<
        "_"+FormatReal(IntRand(0,999999999),"%09.0lf")
-})});
+});
+
+Real graph::initialize(vertex.names);
 
 Real graph::_.edge::add.feature.numeric("Length");
@@ -40 +43 @@
 Real graph::edge.build(data);
 
-
 Real edge.idx = IntRand(1,edge.num);
 Set edge.info = graph::edge.get.all(edge.idx);
@@ -52 +54 @@
 Real ok.1 = edge.idx.1==edge.idx;
 Real ok.2 = edge.idx.2==edge.idx;
+
+Set vertex.names_ = graph::get.vertex.names(?);
+
+Real ok.3 = Card(vertex.names)==Card(vertex.names_);
 
 Real t1 = Copy(Time);
@@ -67 +73 @@
 WriteLn("Loading OIS time "<<(t3-t2)+" seconds");
 
-/*  
 Real numErr1 = Copy(NError);
 Real numWar1 = Copy(NWarning);
 
-Set partialResults_ = [[numErr0, numErr1, ok]];
+Set partialResults_ = [[numErr0, numErr1, 
+                        ok.1, ok.2, ok.3]];
 
 //This is a messure of the success of the test 
 Real quality_ = And(numErr1 == numErr0, 
                     numWar1 == numWar0, 
-                    ok);
+                    ok.1, ok.2, ok.3);
 
 //Return the results