Changeset 3aa9b6 in git

Timestamp:

Sep 7, 2011, 9:09:44 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'cdfcdb8287f66bc6070028082cbbc6eff10e609b')

Children:

993ae23c42531aacfd0a9699643f5d31f6095349

Parents:

24a614b681d4af53443e0c34996cabb9b422a5b7

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-07 21:09:44+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:34+01:00

Message:

TODO: singclap_{irrCharSeries,neworder} are commented out and shell not be used YET!

Files:

• Singular/extra.cc (modified) (2 diffs)
• Singular/ipshell.cc (modified) (1 diff)
• libpolys/polys/clapsing.cc (modified) (1 diff)
• libpolys/polys/clapsing.h (modified) (3 diffs)

Singular/extra.cc

@@ -981 +981 @@
       if(strcmp(sys_cmd,"neworder")==0)
       {
-        if ((h!=NULL) &&(h->Typ()==IDEAL_CMD))
+#if 1
+  Werror("Sorry: not yet re-factored: see libpolys/polys/clapsing.cc");
+  return FALSE;
+#else    
+        if ((h!=NULL) &&(h->Typ()==IDEAL_CMD))
         {
           res->rtyp=STRING_CMD;
@@ -989 +993 @@
         else
           WerrorS("ideal expected");
+#endif  
       }
       else

Singular/ipshell.cc

@@ -2819 +2819 @@
 BOOLEAN jjCHARSERIES(leftv res, leftv u)
 {
+#if 1
+  Werror("Sorry: not yet re-factored: see libpolys/polys/clapsing.cc");
+  return FALSE;
+#else   
   res->data=singclap_irrCharSeries((ideal)u->Data(), currRing);
   return (res->data==NULL);
+#endif
 }
 #endif

libpolys/polys/clapsing.cc

@@ -962 +962 @@
 }*/
 
-/*char* singclap_neworder ( ideal I, const ring r)
+/*
+char* singclap_neworder ( ideal I, const ring r)
 {
   int i;

libpolys/polys/clapsing.h

@@ -24 +24 @@
 
 /*
+// commented out!
 napoly singclap_alglcm ( napoly f, napoly g );
 void singclap_algdividecontent ( napoly f, napoly g, napoly &ff, napoly &gg );
@@ -40 +41 @@
 ideal singclap_sqrfree ( poly f, const ring r );
 
-matrix singclap_irrCharSeries ( ideal I, const ring r);
-
 #ifdef HAVE_NTL
 #if 1
@@ -53 +52 @@
 BOOLEAN singclap_isSqrFree(poly f, const ring r);
 
-char* singclap_neworder ( ideal I, const ring r);
+/* 
+ // need libfac??? commented out!
+ matrix singclap_irrCharSeries ( ideal I, const ring r);
+ char* singclap_neworder ( ideal I, const ring r); 
+*/ 
 
 poly singclap_det( const matrix m, const ring r );