Changeset 2a38d90 in git

Timestamp:

Aug 3, 2011, 6:46:30 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

47f9851c41b863a6cb62e84a4752eb913c8158ca

Parents:

af223b02cc71d0a13ef6b4dc8b7bc7843294331a

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-03 18:46:30+02:00

git-committer:

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

Message:

CHG: minor fixes + idPrint/idShow

Files:

• kernel/fglmhom.cc (modified) (2 diffs)
• kernel/ideals.h (modified) (2 diffs)
• kernel/syz0.cc (modified) (4 diffs)
• libpolys/polys/polys.h (modified) (1 diff)
• libpolys/polys/simpleideals.h (modified) (1 diff)

kernel/fglmhom.cc

@@ -426 +426 @@
 }
 
-ideal
-fglmhomProc(leftv first, leftv second)
+/* ideal fglmhomProc(leftv first, leftv second) // TODO: Move to Singular/
 {
     idhdl dest= currRingHdl;
@@ -441 +440 @@
 
     return( result );
-}
+} */
 
 #endif

kernel/ideals.h

@@ -63 +63 @@
 void idDBTest(ideal h1, int level, const char *f,const int l);
 #define idTest(A) idDBTest(A, PDEBUG, __FILE__,__LINE__)
-#define idPrint(id) idShow(id)
+#define idPrint(id) idShow(id, currRing, currRing)
 #else
 #define idTest(A)  (TRUE)
@@ -193 +193 @@
 
 ideal id_TensorModuleMult(const int m, const ideal M, const ring rRing); // image of certain map for BGG
-
-#ifdef PDEBUG
-/* Shows an ideal -- only for debugging */
-void idShow(const ideal id, const ring lmRing, const ring tailRing, const int debugPrint = 0);
-#else
-#define idShow(id, lmRing, tailRing, debugPrint) ((void)0)
 #endif
-#endif

kernel/syz0.cc

@@ -519 +519 @@
 //#define WRITE_BUCKETS
 #ifdef WRITE_BUCKETS
-PrintS("Input: \n");
-ideal twr=idHead(arg);
-idPrint(arg);
-idDelete(&twr);
-if (modcomp!=NULL) (*modcomp)->show(0,0);
+  PrintS("Input: \n");
+  ideal twr=idHead(arg);
+  idPrint(arg);
+  idDelete(&twr);
+  if (modcomp!=NULL) (*modcomp)->show(0,0);
 #endif
+   
   newmodcomp = new intvec(Fl+2);
-//for (j=0;j<Fl;j++) pWrite(F[j]);
-//PrintLn();
+  //for (j=0;j<Fl;j++) pWrite(F[j]);
+  //PrintLn();
   if (currQuotient==NULL)
     pairs=(polyset)omAlloc0(Fl*sizeof(poly));
@@ -865 +866 @@
   tHomog hom=(tHomog)idHomModule(arg,NULL,&w);
   ring origR = currRing;
-  ring syRing=NULL;
+  ring syRing = NULL;
 
   if ((!isMonomial) && syTestOrder(arg))
@@ -889 +890 @@
       res=newres;
     }
+     
     if ((hom==isHomog)|| (rHasGlobalOrdering(origR)))
     {
       if (syzIndex==0) syInitSort(res[0],&modcomp);
+       
       if ((syzIndex==0) && !rRing_has_CompLastBlock(currRing))
         res[syzIndex+1] = sySchreyersSyzygiesFB(res[syzIndex],&modcomp,mW,FALSE);
       else
         res[syzIndex+1] = sySchreyersSyzygiesFB(res[syzIndex],&modcomp,mW);
+       
       mW = res[syzIndex];
     }
@@ -966 +970 @@
       syzIndex++;
     }
-    j = 0;
-    while (currRing->order[j]!=0) j++;
+//    j = 0; while (currRing->order[j]!=0) j++; // What was this for???!
     rKill(syRing);
   }

libpolys/polys/polys.h

@@ -263 +263 @@
 
 #define pDivide(a,b) p_Divide(a,b,currRing)
+#define pDivideM(a,b) p_DivideM(a,b,currRing)
 #define pLcm(a,b,m) p_Lcm(a,b,m,currRing)
 #define pDiff(a,b)  p_Diff(a,b,currRing)

libpolys/polys/simpleideals.h

@@ -125 +125 @@
 int     idGetNumberOfChoise(int t, int d, int begin, int end, int * choise);
 
+#ifdef PDEBUG
+void idShow(const ideal id, const ring lmRing, const ring tailRing, const int debugPrint = 0);
 #endif
+
+
+#endif