Changeset 9ae30cc in tol

Timestamp:

Jan 2, 2010, 4:34:37 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

42020ce

Parents:

f9b4992

Message:

Los paquetes no pueden contener inicializaciones de efectos secundarios pues no se efectuarán al cargar el OZA

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

Location:

tol_pkg/GisTools

Files:

• GisTools.tol (modified) (3 diffs)
• test/test_0002/test.tol (modified) (1 diff)

tol_pkg/GisTools/GisTools.tol

@@ -124 +124 @@
 
   ////////////////////////////////////////////////////////////////////////////
-  Static Set datum = Copy(Empty); 
-  Static Real BuildDatum(Real void)
-  ////////////////////////////////////////////////////////////////////////////
-  {
-    Set datum := [[
+  Static Set _datum = Copy(Empty); 
+  Static Set Datum(Real void)
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    If(Card(_datum),_datum, {
+    Set _datum := [[
     @UTMFormula::New("NAD83",              6378137,   6356752.3142, "Global");
     @UTMFormula::New("WGS84",              6378137,   6356752.3142, "Global");
@@ -142 +143 @@
     @UTMFormula::New("Bessel.1841",        6377397.2, 6356079.0,    "Central Europe, Chile, Indonesia");
     @UTMFormula::New("Everest.1830",       6377276.3, 6356075.4,    "South Asia") ]];
-    Real SetIndexByName(datum);
-    True
+    Real SetIndexByName(_datum);
+    _datum})
   };
 
@@ -340 +341 @@
 };
 
-
-Real _UTMFormula.BuildDatum = @UTMFormula::BuildDatum(?);
-
 //////////////////////////////////////////////////////////////////////////////
 //Abstract class to handle with a bidimensional point.

tol_pkg/GisTools/test/test_0002/test.tol

@@ -21 +21 @@
 //#Embed "../../../_embed_all.tol";
 
-Set GisTools::@UTMFormula::datum;
+Set datum = GisTools::@UTMFormula::Datum(0);
 /* */
 
-  Matrix data = Include("sample.bmt")[1];
-  VMatrix lon = Mat2VMat(SubCol(data,[[1]]));
-  VMatrix lat = Mat2VMat(SubCol(data,[[2]]));
-  VMatrix deg = lon|lat;
-  VMatrix lonZone = Mat2VMat(SubCol(data,[[3]]));
-  VMatrix latZone = Floor(lat/8)*8;
-  VMatrix x = Mat2VMat(SubCol(data,[[4]]));
-  VMatrix y = Mat2VMat(SubCol(data,[[5]]));
-  VMatrix utm = x|y;
+Matrix data = Include("sample.bmt")[1];
+VMatrix lon = Mat2VMat(SubCol(data,[[1]]));
+VMatrix lat = Mat2VMat(SubCol(data,[[2]]));
+VMatrix deg = lon|lat;
+VMatrix lonZone = Mat2VMat(SubCol(data,[[3]]));
+VMatrix latZone = Floor(lat/8)*8;
+VMatrix x = Mat2VMat(SubCol(data,[[4]]));
+VMatrix y = Mat2VMat(SubCol(data,[[5]]));
+VMatrix utm = x|y;
 
-/* * /
-VMatrix deg = Mat2VMat(Row(80.05111111,57.38666667));
-VMatrix utm = Mat2VMat(Row(442957.26,6360827.14));
-/* * /
-VMatrix deg = { 
-Matrix aux= (
-(80.05111111,-57.38666667),
-(80.05111111,10.38666667),
-(80.05111111,-10.38666667),
-(80.05111111,57.38666667));
-Mat2VMat(aux)};
-VMatrix utm = { 
-Matrix aux= (
-(442957.26,3639172.86),
-(396126.87,1148319.33),
-(396126.87,8851680.67),
-(442957.26,6360827.14));
-Mat2VMat(aux)};
-/* */
-Real zone = 44;
-VMatrix utm_ = GisTools::@UTMFormula::datum::WGS84::deg2utm(deg,lonZone);
-VMatrix deg_ = GisTools::@UTMFormula::datum::WGS84::utm2deg(utm,lonZone,latZone);
+VMatrix utm_ = datum::WGS84::deg2utm(deg,lonZone);
+VMatrix deg_ = datum::WGS84::utm2deg(utm,lonZone,latZone);
 
 VMatrix cmp = deg | deg_ | utm | utm_ | lonZone | latZone;
   Real deg.quality = Max(0,1-VMatMax(Abs(deg-deg_)));
-  Real utm.quality = Max(0,1-VMatMax(Round(Abs(utm-utm_))))
+  Real utm.quality = Max(0,1-VMatMax(Round(Abs(utm-utm_))));
 
-/*
+
 Real numErr1 = Copy(NError);
 Real numWar1 = Copy(NWarning);
 
-Set partialResults_ = [[numErr0, numErr1]];
+Set partialResults_ = [[numErr0, numErr1,deg.quality,utm.quality]];
 
 //This is a messure of the success of the test 
-Real quality_ = And(numErr1 == numErr0);
+Real quality_ = And(numErr1 == numErr0)*deg.quality*utm.quality;
 
 //Return the results