Changeset a13956 in git for libfac/factor/MVMultiHensel.cc

Timestamp:

Nov 9, 2010, 12:01:07 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

c48726524b56e7c3adf69f25d82e664ace8c9211

Parents:

c6303a2b3f5bacd5773ec7cc726ac4487379de70

Message:

factoryError, removed dep. on SINGULAR


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

File:

• libfac/factor/MVMultiHensel.cc (modified) (3 diffs)

libfac/factor/MVMultiHensel.cc

@@ -26 +26 @@
 #include "MVMultiHensel.h"
 
-#ifdef SINGULAR
-#define HAVE_SINGULAR_ERROR
 #ifndef NOSTREAMIO
 void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
 #endif
-#endif
-
-#ifdef HAVE_SINGULAR_ERROR
+
 extern int libfac_interruptflag;
-   extern "C"
-   {
-     void WerrorS(const char *);
-     void Werror(const char *fmt, ...);
-   }
-#endif
 
 #ifdef HENSELDEBUG
@@ -150 +140 @@
   if ( (degree(F1,levelU) + degree(F2,levelU) ) <= i )
   {
-#ifdef HAVE_SINGULAR_ERROR
-    if (!interrupt_handle()) Werror("libfac: diophant ERROR: degree too large!  (%d + %d <= %d)",degree(F1,levelU), degree(F2,levelU), i);
-      //out_cf("F1:",F1,"\n");
-      //out_cf("F2:",F2,"\n");
-#else
-#ifndef NOSTREAMIO
-    CERR << "libfac: diophant ERROR: degree too large!  "
-         << (degree(F1,levelU) + degree(F2,levelU) ) <<"\n";
-#else
-    ;
-#endif
-#endif
+    if (!interrupt_handle()) factoryError("libfac: diophant ERROR: degree too large!"); /*  (%d + %d <= %d)",degree(F1,levelU), degree(F2,levelU), i);*/
     Retvalue.One=F1;Retvalue.Two=F2;
     return Retvalue;
@@ -194 +173 @@
         }
       } 
-#ifdef HAVE_SINGULAR_ERROR
-      if (!interrupt_handle()) WerrorS("libfac: diophant ERROR: F1 and F2 are not relatively prime! ");
-#ifndef NOSTREAMIO
-      out_cf("F1:",F1,"\n");
-      out_cf("F2:",F2,"\n");
-      out_cf("gcd:",r,"\n");
-#endif
-#else
-#ifndef NOSTREAMIO
-      CERR << "libfac: diophant ERROR: " << F1 << "  and  " << F2
-           << "  are not relatively prime!" << "\n";
-#else
-     ;
-#endif
-#endif
+      if (!interrupt_handle())
+        factoryError("libfac: diophant ERROR: F1 and F2 are not relatively prime! ");
       Retvalue.One=s/r;Retvalue.Two=t/r;
       return Retvalue;