Changeset a4cef35 in tol

Timestamp:

Jul 10, 2011, 12:39:30 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

8683c44

Parents:

d445cda

Message:

closes #1004, la representación Text de los infinitos 1/0 y -1/0 es evaluable en la gramática Real dando como resultado el Real correspondiente.

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

File:

• tol/bmath/mathobjects/dat.cpp (modified) (1 diff)

tol/bmath/mathobjects/dat.cpp

@@ -1119 +1119 @@
 //--------------------------------------------------------------------
 {
-  BText txt, bformat_out;
-  char format_in[80], format_out[80], str_in[1024], str_out[1024];
   if(Known())
   {
-    int i,j;
-    setlocale( LC_NUMERIC, TOL_lc_numeric());
-    strcpy(format_in, format.String());
-    for(i=0, j=0; format_in[i]!='\0'; i++)
-    {
-      if(format_in[i]!='\'') 
-      { format_out[j++] = format_in[i]; }
+    if ( IsFinite() ) {
+      BText txt, bformat_out;
+      char format_in[80], format_out[80], str_in[1024], str_out[1024];
+      int i,j;
+      setlocale( LC_NUMERIC, TOL_lc_numeric());
+      strcpy(format_in, format.String());
+      for(i=0, j=0; format_in[i]!='\0'; i++)
+        {
+          if(format_in[i]!='\'') 
+            { format_out[j++] = format_in[i]; }
+        }
+      format_out[j++] = '\0';
+      bformat_out = format_out;
+      //txt.Copy(Value(), format.String());
+      txt.Copy(Value(), bformat_out);
+      strcpy(str_in, txt.Buffer());
+      markThousands(str_out, str_in);
+      txt = str_out;
+      setlocale( LC_NUMERIC, "C");
+      //  if(Value()==floor(Value())) { txt.Copy(BInt(Value())); }
+      return txt;
+    } else if ( IsPosInf() ) {
+      return "1/0";
+    } else if ( IsNegInf() ) {
+      return "-1/0";
+    } else {
+      return "?";
     }
-    format_out[j++] = '\0';
-    bformat_out = format_out;
-    //txt.Copy(Value(), format.String());
-    txt.Copy(Value(), bformat_out);
-    strcpy(str_in, txt.Buffer());
-    markThousands(str_out, str_in);
-    txt = str_out;
-    setlocale( LC_NUMERIC, "C");
-    //  if(Value()==floor(Value())) { txt.Copy(BInt(Value())); }
-  }
-  else { txt="?"; }
-  return(txt);
+  }
+  else { return "?"; }
 }