Changeset f7b99ac in tol

Timestamp:

Nov 6, 2009, 7:35:44 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

e8916d6

Parents:

17c9671

Message:

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

Location:

tol_pkg/graphtools

Files:

• graphtools.tol (modified) (8 diffs)
• test/test_0001/test.tol (modified) (2 diffs)

tol_pkg/graphtools/graphtools.tol

@@ -169 +169 @@
   };
 
-
   ////////////////////////////////////////////////////////////////////////////
   Text _.autodoc.member.get = "Returns the value of a feature for an entity";
@@ -176 +175 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-    (_.feature[feature])::get(_.data, entity)
+    @Feature.Abstract f = _.feature[feature];
+    f::get(_.data, entity)
   };
 
@@ -185 +185 @@
   ////////////////////////////////////////////////////////////////////////////
   { 
-    SetRow(EvalSet(_.feature, Anything(Real f) { get(entity, f) }))
+    EvalSet(_.feature, Anything get.all.cycle(@FeatureSet f) 
+    { 
+      f::get(_.data, entity)
+    })
   }
 
@@ -204 +207 @@
   //The identifier of the graph
   Text _.name;
+  //Indicates if the graph is directed or symmetric
+  Real _.directed;
   //Features of vertices. First feature must be the identifier of vertices
   @FeatureSet _.vertex = @FeatureSet::New(?);
@@ -214 +219 @@
   //Sparse matrix storing index of edge for each cell (out,in) 
   VMatrix _.edge.map = Rand(0,0,0,0);
-  
+  VMatrix _.edge.map.rep = Rand(0,0,0,0);
+  Real _.edge.check.rep = ?;
+
   ////////////////////////////////////////////////////////////////////////////
   Static Text _.autodoc.member.New = "Creates a new instance of "
   "Class @Graph";
-  Static @Graph New(Text name)
+  Static @Graph New(Text name, Real directed)
   ////////////////////////////////////////////////////////////////////////////
   {
     @Graph aux =
     [[
-      Text _.name = name
+      Text _.name = name;
+      Real _.directed = directed
     ]]
   };
@@ -239 +247 @@
     Real _.vertex::add.feature.nonnumeric("Identifier", vertex.names);
     Matrix _.vertex::_.data := DifEq(1/(1-B),Rand(_.vertex.num,1,1,1));
+    Real _.edge::add.feature.numeric("Output");
     Real _.edge::add.feature.numeric("Input");
-    Real _.edge::add.feature.numeric("Output");
     True
   };
@@ -249 +257 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-    Matrix _.edge::_.data := data;
     Real _.edge.num := Rows(data);
-    Matrix in  = SubCol(data,[[1]]);
-    Matrix out = SubCol(data,[[2]]);
+    Matrix out_ = SubCol(data,[[1]]);
+    Matrix in_  = SubCol(data,[[2]]);
+    Matrix out  = If(_.directed, out_, Min(in_, out_));
+    Matrix in   = If(_.directed, in_,  Max(in_, out_));
+    Matrix _.edge::_.data := out | in | SubCol(data,Range(3,Columns(data),1));
     Matrix idx = DifEq(1/(1-B),Rand(_.edge.num,1,1,1));
-    VMatrix triplet = Triplet(in|out|idx,_.vertex.num,_.vertex.num);
+    VMatrix triplet = Triplet(out|in|idx,_.vertex.num,_.vertex.num);
     VMatrix _.edge.map := Convert(triplet,"Cholmod.R.Sparse");
+    Matrix idx.rep = Rand(_.edge.num,1,1,1);
+    VMatrix triplet.rep = Triplet(out|in|idx.rep,_.vertex.num,_.vertex.num);
+    VMatrix _.edge.map.rep := Convert(triplet.rep,"Cholmod.R.Sparse");
+    Real _.edge.check.rep := VMatMax(_.edge.map.rep)>1;
+    If(_.edge.check.rep,
+    {
+      WriteLn("[GraphTools::@Graph "+_.name+"::edge.build()] "+
+              "There are repeated edges","E")
+    });
     True
   };
@@ -271 +290 @@
   Text _.autodoc.member.edge.index = "Returns the index of an edge or 0 "
   "if it not exists";
-  Real edge.index(Real in, Real out)
-  ////////////////////////////////////////////////////////////////////////////
-  {
+  Real edge.index(Real out_, Real in_)
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    Real out  = If(_.directed, out_, Min(in_, out_));
+    Real in   = If(_.directed, in_,  Max(in_, out_));
     VMatDat(_.edge.map, in, out)
+  };
+
+  ////////////////////////////////////////////////////////////////////////////
+  Text _.autodoc.member.edge.get.all = "";
+  Set edge.get.all(Real idx)
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    _.edge::get.all(idx)
   }
 

tol_pkg/graphtools/test/test_0001/test.tol

@@ -14 +14 @@
 #Embed "../../graphtools.tol";
 
-Real vertex.num =   20000;
-Real edge.num   =  300000;
+Real vertex.num =  2000;
+Real edge.num   =  300;
 
-WriteLn("Creating graph with  "<<vertex.num+ " vertices and "<<
+WriteLn("Creating graph with  "<<vertex.num+ " vertices and close to "<<
         edge.num+" edges ...");
 Real t0 = Copy(Time);
 
-GraphTools::@Graph graph = GraphTools::@Graph::New("test_0001");
+GraphTools::@Graph graph = GraphTools::@Graph::New("test_0001",True);
 
 Real graph::initialize(Set { vertex.names = For(1,vertex.num,Text(Real k)
 {
-   "Key_"<<FormatReal(k,"%6.0f")<<
-       "_"+FormatReal(IntRand(0,999999999),"%9.0lf")
+   "Key_"<<FormatReal(k,"0%6.0f")<<
+       "_"+FormatReal(IntRand(0,999999999),"%09.0lf")
 })});
 
@@ -32 +32 @@
 Real graph::_.edge::add.feature.numeric("Hight");
 
-Real graph::edge.build(Matrix { data = 
+
+Matrix data = 
   { 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);
+
+
+Real edge.idx = IntRand(1,edge.num);
+Set edge.info = graph::edge.get.all(edge.idx);
+Real edge.idx.1 = graph::edge.index(edge.info[1], edge.info[2]);
+Real edge.idx.2 = graph::edge.index(edge.info[2], edge.info[1]);
+
+WriteLn("edge.idx = "<<edge.idx);
+WriteLn("edge.idx.1 = "<<edge.idx.1);
+WriteLn("edge.idx.2 = "<<edge.idx.2);
+
+Real ok.1 = edge.idx.1==edge.idx;
+Real ok.2 = edge.idx.2==edge.idx;
 
 Real t1 = Copy(Time);