Changeset 13f9a4e in tol

Timestamp:

Mar 2, 2010, 8:36:08 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

0907790

Parents:

77c938e

Message:

Using efficient grouping functions

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

Location:

tol_pkg

Files:

• FunRn2R/BaseC2.Concat.tol (modified) (1 diff)
• GisTools/Interp2D.tol (modified) (2 diffs)
• MatQuery/test/test_0001/test.tol (modified) (2 diffs)
• MulVarFunAprox/DesignC2.Monomial.Spheric.Rectangle.tol (modified) (2 diffs)
• MulVarFunAprox/IndexedGrid.tol (modified) (1 diff)

tol_pkg/FunRn2R/BaseC2.Concat.tol

@@ -24 +24 @@
   {
     Real n = (base[1])::_.n;
-    Set map = BinGroup("<<", For(1,Card(base),Set(Real h)
+    Set map = SetConcat(For(1,Card(base),Set(Real h)
     {
       If((base[h])::_.n!=n,WriteLn("[@BaseC2.Concat::New] "

tol_pkg/GisTools/Interp2D.tol

@@ -142 +142 @@
     Real j.min = Max(1,p.y.class-1);
     Real j.max = Min(Card(_.y.range)+1,p.y.class+1);
-    Set p.candidates = BinGroup("<<",For(i.min, i.max, Set(Real i)
-    {
-      BinGroup("<<",For(j.min, j.max, Set(Real j)
+    Set p.candidates = SetConcat(For(i.min, i.max, Set(Real i)
+    {
+      SetConcat(For(j.min, j.max, Set(Real j)
       {
         _.grid[i][j]  
@@ -171 +171 @@
     Real j.min = Max(1,p.y.class-1);
     Real j.max = Min(Card(_.y.range)+1,p.y.class+1);
-    Set p.candidates = BinGroup("<<",For(i.min, i.max, Set(Real i)
-    {
-      BinGroup("<<",For(j.min, j.max, Set(Real j)
+    Set p.candidates = SetConcat(For(i.min, i.max, Set(Real i)
+    {
+      SetConcat(For(j.min, j.max, Set(Real j)
       {
         _.grid[i][j]  

tol_pkg/MatQuery/test/test_0001/test.tol

@@ -51 +51 @@
 
 //Locations of cities
-Matrix city.center = BinGroup("<<",For(1,city.num, Matrix(Real city)
+Matrix city.center = Group("ConcatRows",For(1,city.num, Matrix(Real city)
 {
   Rand(1, 2, coord.min, coord.max)
@@ -68 +68 @@
 
 //All points
-VMatrix points = Mat2VMat(BinGroup("<<",city.points));
+VMatrix points = Mat2VMat(Group("ConcatRows",city.points));
 
 

tol_pkg/MulVarFunAprox/DesignC2.Monomial.Spheric.Rectangle.tol

@@ -174 +174 @@
     VMatrix _.Y.neighbourhood := _.Y.h | If(!force.reference.near.nodal,
     {
-      Set aux.1 = BinGroup("<<", For(1,_.n,Set(Real i)
+      Set aux.1 = SetConcat(For(1,_.n,Set(Real i)
       {
         VMatrix pre  = SubCol(_.Y,Range(1,  i-1,1));
@@ -184 +184 @@
     },
     {
-      Set aux.1 = BinGroup("<<", For(1,_.n,Set(Real i)
+      Set aux.1 = SetConcat(For(1,_.n,Set(Real i)
       {
         VMatrix pre    = SubCol(_.Y,Range(1,  i-1,1));

tol_pkg/MulVarFunAprox/IndexedGrid.tol

@@ -159 +159 @@
     VMatrix Y.neighbour.pos = _.Y + Rand(_.H,_.n,_.edge.length,_.edge.length);
     VMatrix Y.neighbour.neg = _.Y - Rand(_.H,_.n,_.edge.length,_.edge.length);
-    Set _.Y.neighbourhood.point := BinGroup("<<", For(1,_.n,Set(Real i)
+    Set _.Y.neighbourhood.point := SetConcat(For(1,_.n,Set(Real i)
     { 
       VMatrix pre  = SubCol(_.Y,Range(1,  i-1,1));