Changeset cc77af9 in tol

Timestamp:

Nov 13, 2009, 4:09:54 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

69fede85

Parents:

a392913

Message:

Using VMatrix wen possible

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

File:

• tol_pkg/GraphTools/GraphTools.tol (modified) (5 diffs)

tol_pkg/GraphTools/GraphTools.tol

@@ -9 +9 @@
 //////////////////////////////////////////////////////////////////////////////
 [[
-#Require MatEncode;
-#Require MatQuery;
+  #Require MatEncode;
+  #Require MatQuery;
 
 Text _.autodoc.description = "Functions and classes related with Graph "
@@ -77 +77 @@
     });
     Real _.vertex::add.feature.nonnumeric("Identifier", vertex.names);
-    Matrix _.vertex::_.data := DifEq(1/(1-B),Rand(_.vertex.num,1,1,1));
+    VMatrix _.vertex::_.data := DifEq(1/(1-B),Rand(_.vertex.num,1,1,1));
     Real _.edge::add.feature.numeric("Output");
     Real _.edge::add.feature.numeric("Input");
@@ -85 +85 @@
   ////////////////////////////////////////////////////////////////////////////
   Text _.autodoc.member.edge.build = "";
-  Real edge.build(Matrix data, Real removeRepeatedEdges)
-  ////////////////////////////////////////////////////////////////////////////
-  {
-    Real _.edge.num := Rows(data);
-    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));
-    Matrix idx.rep = Rand(_.edge.num,1,1,1);
-    Matrix outInRep = out|in|idx.rep;
+  Real edge.build(VMatrix data, Real removeRepeatedEdges)
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    Real _.edge.num := VRows(data);
+    VMatrix out_ = SubCol(data,[[1]]);
+    VMatrix in_  = SubCol(data,[[2]]);
+    VMatrix out  = If(_.directed, out_, Min(in_, out_));
+    VMatrix in   = If(_.directed, in_,  Max(in_, out_));
+    VMatrix _.edge::_.data := out|in|SubCol(data,Range(3,VColumns(data),1));
+    VMatrix idx = DifEq(1/(1-B),Rand(_.edge.num,1,1,1));
+    VMatrix idx.rep = Rand(_.edge.num,1,1,1);
+    Matrix outInRep = VMat2Mat(out|in|idx.rep);
     VMatrix triplet.rep = Triplet(outInRep,_.vertex.num,_.vertex.num);
     VMatrix _.edge.repeated := Convert(triplet.rep,"Cholmod.R.Sparse");
@@ -125 +125 @@
       Triplet
     });
-    VMatrix triplet.map = funTriplet(out|in|idx,_.vertex.num,_.vertex.num);
+    VMatrix triplet.map = funTriplet(
+      VMat2Mat(out|in|idx),_.vertex.num,_.vertex.num);
     VMatrix _.edge.map := Convert(triplet.map,"Cholmod.R.Sparse");
-    VMatrix _.edge.map.t := Tra(_.edge.map);
     True
   };
@@ -265 +265 @@
 guarda en un set. Sólo crea las que no existan aún. Sólo devuelve la del
 orden solicitado.
-Matrix get.adyacency(Real order)
+VMatrix get.adyacency(Real order)
 ////////////////////////////////////////////////////////////////////////////