Changeset f0168a5 in git for Singular/ipshell.cc

Timestamp:

Dec 15, 2011, 3:37:04 AM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

ee668eff445bb4cf7e96d94673c39f627a30d232

Parents:

81845eb574ce4e246556ba7885ecb3a9be8222a9

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-15 03:37:04+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:09:33+01:00

Message:

enable char_series

FIX: readd / uncomment / enable char_series

File:

• Singular/ipshell.cc (modified) (1 diff)

Singular/ipshell.cc

@@ -2821 +2821 @@
 #endif
 
+BOOLEAN jjRESULTANT(leftv res, leftv u, leftv v, leftv w)
+{
 #ifdef HAVE_FACTORY
-BOOLEAN jjRESULTANT(leftv res, leftv u, leftv v, leftv w)
-{
   res->data=singclap_resultant((poly)u->CopyD(),(poly)v->CopyD(),
                   (poly)w->CopyD(), currRing);
   return errorreported;
-}
-BOOLEAN jjCHARSERIES(leftv res, leftv u)
-{
-#if 1
+#else
   Werror("Sorry: not yet re-factored: see libpolys/polys/clapsing.cc");
   return FALSE;
-#else
+#endif
+}
+
+BOOLEAN jjCHARSERIES(leftv res, leftv u)
+{
+#if defined(HAVE_FACTORY) && defined(HAVE_LIBFAC)
   res->data=singclap_irrCharSeries((ideal)u->Data(), currRing);
   return (res->data==NULL);
+#else
+  Werror("Sorry: not yet re-factored: see libpolys/polys/clapsing.cc");
+  return FALSE;
 #endif
 }
-#endif
 
 // from semic.cc