Changeset 2d517f2 in tol

Timestamp:

Nov 26, 2009, 9:01:02 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

047c98d

Parents:

389cf33

Message:

Fixes #286
Relates to #784

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

File:

• tol/btol/set_type/setgra.cpp (modified) (1 diff)

tol/btol/set_type/setgra.cpp

@@ -780 +780 @@
     return;
   }
-  double from = fromDat.Value();
+  double from  = fromDat.Value();
   double until = untilDat.Value();
-  double step = stepDat.Value();
+  double step  = stepDat.Value();
   int k;
   double x;
-  if (step == 0.0) { /* warning!!! : this is a bad comparison */
+  if(step == 0.0) { /* warning!!! : this is a bad comparison */
     Warning(I2("Argument 'p' of function Range cannot be zero",
                "El argumento 'p' de la función Range no puede ser cero."));
     return;
   }
-  for(k=0;;k++)
+  if(((step>0.0)&&(until<from))||
+     ((step<0.0)&&(until>from))) { return; }
+  int K = 1+(int)floor(1.0+fabs((from-until)/step)-1.0);
+  for(k=0; k<K; k++)
   {
-    x = from + step*k;
-    if((step>0)?(x>until):(x<until)) { break; }
+    x = 1.0 + (from + step*k) -1.0;
     LstFastAppend(result, aux, new BContensDat("",x));
   }