Changeset cfbe751 in git

Timestamp:

May 3, 2005, 3:03:47 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

78852a595e4c0c00b81ac057654ecebc227d4929

Parents:

837fed2f698dd419c978422354241720c8bd3f78

Message:

*hannes: do not divide by 0


git-svn-id: file:///usr/local/Singular/svn/trunk@8018 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• mpr_base.cc (modified) (4 diffs)
• mpr_numeric.cc (modified) (6 diffs)

kernel/mpr_base.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_base.cc,v 1.1.1.1 2003-10-06 12:15:56 Singular Exp $ */
+/* $Id: mpr_base.cc,v 1.2 2005-05-03 13:03:46 Singular Exp $ */
 
 /*
@@ -1871 +1871 @@
         pSetCoeff( phelp, nCopy(evpoint[cp-1]) );
         pSetComp( phelp, IMATELEM(*uRPos,i,cp) );
-        pSetmComp( phelp );
+        //pSetmComp( phelp );
+        pSetm( phelp );
+        //Print("comp %d\n",IMATELEM(*uRPos,i,cp));
+        #if 0
         if ( piter!=NULL )
         {
@@ -1882 +1885 @@
           piter= phelp;
         }
+        #else
+        pp=pAdd(pp,phelp);
+        #endif
       }
     }
@@ -1888 +1894 @@
     pSetExp(phelp,1,1);
     pSetComp( phelp, IMATELEM(*uRPos,i,idelem+1) );
+    //    Print("comp %d\n",IMATELEM(*uRPos,i,idelem+1));
     pSetm( phelp );
+    #if 0
     pNext(piter)= phelp;
+    #else
+    pp=pAdd(pp,phelp);
+    #endif
+    pTest(pp);
     (rmat->m)[IMATELEM(*uRPos,i,1)]= pp;
   }

kernel/mpr_numeric.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpr_numeric.cc,v 1.1.1.1 2003-10-06 12:15:56 Singular Exp $ */
+/* $Id: mpr_numeric.cc,v 1.2 2005-05-03 13:03:47 Singular Exp $ */
 
 /*
@@ -302 +302 @@
   omFreeSize( (ADDRESS) theroots, (tdg)*sizeof(gmp_complex*) );
 
-  mprPROTnl("~rootContainer()");
+  //mprPROTnl("~rootContainer()");
 }
 //<-
@@ -371 +371 @@
       }
     }
-    pSetm( result );
+    if (result!=NULL) pSetm( result );
   }
 
@@ -514 +514 @@
       }
     }
-    if (!type) x = o/x;
+    if ((!type)&&(!((x.real()==zero)&&(x.imag()==zero)))) x = o/x;
     if (x.imag() == zero)
     {
@@ -691 +691 @@
   gmp_float zero(0.0);
 
-  if (j>k)
+  if ((j>k)
+  &&(((*a[2]).real()!=zero)||((*a[2]).imag()!=zero)))
   {
     gmp_complex sq(zero);
@@ -724 +725 @@
   else
   {
-    *r[k]= (gmp_complex)0.0-(*a[0] / *a[1]);
-    if(r[k]->imag()==zero)
-      j++;
+    if (((*a[1]).real()==zero) && ((*a[1]).imag()==zero))
+    {
+      WerrorS("precision lost, try again with higher precision");
+    }
     else
-      k--;
+    {
+      *r[k]= (gmp_complex)0.0-(*a[0] / *a[1]);
+      if(r[k]->imag()==zero)
+        j++;
+      else
+        k--;
+    }
   }
 }