Changeset 8fa9ea in git

Timestamp:

Aug 3, 2011, 5:32:19 PM (12 years ago)

Author:

Burcin Erocal <burcin@…>

Branches:

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

Children:

e9491865308ddf1d95e94e546e5c0c8b40c94544

Parents:

567abae6e8087f803d5e7dc28c7fda93123381ce

git-author:

Burcin Erocal <burcin@erocal.org>2011-08-03 17:32:19+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:14:17+01:00

Message:

Fix Singular/subexpr.cc.

Files:

• Singular/ipshell.h (modified) (1 diff)
• Singular/makefile (modified) (1 diff)
• Singular/subexpr.cc (modified) (12 diffs)
• libpolys/reporter/reporter.h (modified) (1 diff)

Singular/ipshell.h

@@ -85 +85 @@
                          idhdl pl, BOOLEAN autoexport, BOOLEAN tellerror);
 
+// converts a resolution into a list of modules
+lists syConvRes(syStrategy syzstr,BOOLEAN toDel=FALSE,int add_row_shift=0);
+// converts a list of modules into a minimal resolution
+syStrategy syForceMin(lists li);
+// converts a list of modules into a resolution
+syStrategy syConvList(lists li,BOOLEAN toDel);
+
+
 
 /* ================================================================== */

Singular/makefile

@@ -362 +362 @@
 
 feOptES.inc: feOpt.cc mod2.h
-        $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX  -DESINGULAR -I../kernel feOpt.cc -o feOptES
+        $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} -DESINGULAR -I../kernel feOpt.cc -o feOptES
         ./feOptES
         rm -f feOptES feOptES.exe
 
 feOptTS.inc: feOpt.cc mod2.h
-        $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX  -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
+        $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
         ./feOptTS
         rm -f feOptTS feOptTS.exe

Singular/subexpr.cc

@@ -28 +28 @@
 #include <kernel/timer.h>
 #include <polys/monomials/ring.h>
-#include <kernel/ffields.h>
+#include <coeffs/ffields.h>
 #include <coeffs/numbers.h>
-#include <kernel/longrat.h>
+#include <coeffs/longrat.h>
 #include <Singular/ipshell.h>
 #include <Singular/lists.h>
@@ -120 +120 @@
           break;
         case MATRIX_CMD:
-          iiWriteMatrix((matrix)d,n,2,spaces);
+          iiWriteMatrix((matrix)d,n,2, currRing, spaces);
           break;
         case MODUL_CMD:
@@ -132 +132 @@
           // no break:
         case MAP_CMD:
-          iiWriteMatrix((matrix)d,n,1,spaces);
+          iiWriteMatrix((matrix)d,n,1, currRing, spaces);
           break;
         case POLY_CMD:
@@ -372 +372 @@
       return (void *)ivCopy((intvec *)d);
     case MATRIX_CMD:
-      return (void *)mpCopy((matrix)d);
+      return (void *)mp_Copy((matrix)d, currRing);
     case IDEAL_CMD:
     case MODUL_CMD:
@@ -392 +392 @@
       return  (void *)nCopy((number)d);
     case BIGINT_CMD:
-      return  (void *)nlCopy((number)d);
+      return  (void *)nlCopy((number)d, currRing->cf);
     case MAP_CMD:
-      return  (void *)maCopy((map)d);
+      return  (void *)maCopy((map)d, currRing);
     case LIST_CMD:
       return  (void *)lCopy((lists)d);
@@ -616 +616 @@
     void *x=data;
     if (rtyp==VNOETHER) x=(void *)pCopy(ppNoether);
-    else if ((rtyp==VMINPOLY)&& (currRing->minpoly!=NULL)&&(!rField_is_GF()))
-      x=(void *)nCopy(currRing->minpoly);
+    else if ((rtyp==VMINPOLY)&& \
+                    nCoeff_is_Extension(currRing->cf) && \
+                    (!nCoeff_is_GF(currRing->cf)))
+      x=(void *)p_Copy(currRing->cf->extRing->minideal->m[0],
+                      currRing->cf->extRing );
     data=NULL;
     return x;
@@ -726 +729 @@
             data=(char *)n;
           }
-          else if((rtyp==VMINPOLY)&&(rField_is_GF()))
-          {
-            nfShowMipo();
+          else if((rtyp==VMINPOLY)&&(rField_is_GF(currRing)))
+          {
+            nfShowMipo(currRing->cf);
           }
           else
@@ -749 +752 @@
 
         case MATRIX_CMD:
-          s= iiStringMatrix((matrix)d,dim);
+          s= iiStringMatrix((matrix)d,dim, currRing);
           if (typed)
           {
@@ -766 +769 @@
         case IDEAL_CMD:
         case MAP_CMD:
-          s= iiStringMatrix((matrix)d,dim);
+          s= iiStringMatrix((matrix)d,dim, currRing);
           if (typed)
           {
@@ -811 +814 @@
             if (t/*Typ()*/ == QRING_CMD)
             {
-              char* id = iiStringMatrix((matrix) ((ring) d)->qideal, dim);
+              char* id = iiStringMatrix((matrix) ((ring) d)->qideal, dim,
+                              currRing);
               ns = (char*) omAlloc(strlen(s) + strlen(id) + 20);
               sprintf(ns, "\"%s\";%sideal(%s)", s,(dim == 2 ? "\n" : " "), id);
@@ -1022 +1026 @@
       case VSHORTOUT:  return (void *)(currRing != NULL ? currRing->ShortOut : 0);
       case VMINPOLY:   if (currRing != NULL &&
-                           (currRing->minpoly!=NULL)&&(!rField_is_GF()))
+                           nCoeff_is_Extension(currRing->cf)&&
+                           !nCoeff_is_GF(currRing->cf))
                        /* Q(a), Fp(a), but not GF(q) */
-                         return (void *)currRing->minpoly;
+                         return (void *)currRing->cf->extRing->minideal->m[0];
                        else
-                         return (void *)nNULL;
+                         return (void *)currRing->cf->nNULL;
       case VNOETHER:   return (void *) ppNoether;
       case IDHDL:
@@ -1382 +1387 @@
     {
       int vnr;
-      if ((vnr=rIsRingVar(id))>=0)
+      if ((vnr=r_IsRingVar(id, currRing))>=0)
       {
         poly p=pOne();

libpolys/reporter/reporter.h

@@ -15 +15 @@
 extern int    feErrorsLen;
 extern FILE*  feProtFile;
+extern int    si_echo, printlevel;
 extern int    pagelength, colmax;
 extern int    yy_blocklineno;