Changeset 31f1850 in git for Singular

Timestamp:

Jan 10, 2012, 4:20:10 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

930ea815182bc9bf3182f1c57876006af26295b2

Parents:

a74143eec598021f060c389b66230f8f035cc1c5

Message:

chg: pDeg leads to confusion, removed to p_Deg

Location:

Singular

Files:

• janet.cc (modified) (2 diffs)
• wrapper.cc (modified) (1 diff)

Singular/janet.cc

@@ -44 +44 @@
 
 //#define pow_(x) pTotaldegree((x))
-//#define pow_(x) pDeg((x))
+//#define pow_(x) p_Deg((x,currRing))
 pFDegProc jDeg;
 #define pow_(x) jDeg((x),currRing)
@@ -957 +957 @@
   {
     degree_compatible=1;
-    jDeg=pDeg;
+    jDeg=p_Deg;
     ListGreatMove=ListGreatMoveDegree;
   }

Singular/wrapper.cc

@@ -89 +89 @@
       {
         //if (pTotaldegree(iT->info->lead) == pTotaldegree(iT->info->history))
-        if (pDeg(iT->info->lead) == pDeg(iT->info->history))
+        if (p_Deg(iT->info->lead,currRing) == p_Deg(iT->info->history,currRing))
         {
           result->m[ideal_length-ideal_index-1]=pCopy(iT->info->root);