Changeset f0168a5 in git

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

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

Files:

• Singular/ipshell.cc (modified) (1 diff)
• Singular/ipshell.h (modified) (1 diff)
• Singular/table.h (modified) (1 diff)
• libpolys/polys/clapsing.h (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

Singular/ipshell.h

@@ -231 +231 @@
 BOOLEAN nuUResSolve( leftv res, leftv args );
 
-
-#endif
-
+BOOLEAN jjCHARSERIES(leftv res, leftv u);
+/*
+BOOLEAN jjRESULTANT(leftv res, leftv u, leftv v, leftv w);
+#if 0
+BOOLEAN jjIS_SQR_FREE(leftv res, leftv u);
+#endif
+*/
+
+
+#endif
+

Singular/table.h

@@ -45 +45 @@
 ,{D(jjCHAR),       CHARACTERISTIC_CMD, INT_CMD,     RING_CMD      , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjCHAR),       CHARACTERISTIC_CMD, INT_CMD,     QRING_CMD     , ALLOW_PLURAL |ALLOW_RING}
-#ifdef HAVE_FACTORY
-// need LIBFAC
-//,{D(jjCHARSERIES), CHAR_SERIES_CMD, MATRIX_CMD,     IDEAL_CMD     , NO_PLURAL |NO_RING}
-#else
-,{  jjWRONG ,      CHAR_SERIES_CMD, MATRIX_CMD,     IDEAL_CMD     , NO_PLURAL |NO_RING}
-#endif
+,{D(jjCHARSERIES), CHAR_SERIES_CMD, MATRIX_CMD,     IDEAL_CMD     , NO_PLURAL |NO_RING}
 ,{D(jjrCharStr),   CHARSTR_CMD,     XS(STRING_CMD), RING_CMD      , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjrCharStr),   CHARSTR_CMD,     XS(STRING_CMD), QRING_CMD     , ALLOW_PLURAL |ALLOW_RING}

libpolys/polys/clapsing.h

@@ -59 +59 @@
 poly singclap_det( const matrix m, const ring r );
 int singclap_det_i( intvec * m, const ring r );
-/*
-BOOLEAN jjRESULTANT(leftv res, leftv u, leftv v, leftv w);
-BOOLEAN jjCHARSERIES(leftv res, leftv u);
-#if 0
-BOOLEAN jjIS_SQR_FREE(leftv res, leftv u);
-#endif
-*/
 
 number   nChineseRemainder(number *x, number *q,int rl, const coeffs r);