Changeset 471858 in git

Timestamp:

Mar 10, 2017, 3:22:39 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

b1ec60dda21b72f562a931d4da936be98e0bec19

Parents:

75e126f231b0425bbf4812858e05812ee8493adf

Message:

code cleanup: sparmat

Files:

• Singular/iparith.cc (modified) (1 diff)
• libpolys/polys/sparsmat.cc (modified) (3 diffs)

Singular/iparith.cc

@@ -3556 +3556 @@
 }
 // dummy for python_module.so and similiar
-static BOOLEAN jjSetRing(leftv res, leftv u)
+static BOOLEAN jjSetRing(leftv, leftv u)
 {
   if (u->rtyp==IDHDL) rSetHdl((idhdl)u->data);

libpolys/polys/sparsmat.cc

@@ -7 +7 @@
 */
 
-
-
-
 #include <misc/auxiliary.h>
 
@@ -26 +23 @@
 
 #include "simpleideals.h"
-
 
 #include "sparsmat.h"
@@ -211 +207 @@
       k = p_GetComp(p, currRing)-1;
       kr = r[k];
-      for (j=rVar(currRing);j>0;j--)
-      {
-        if(p_GetExp(p,j, currRing)>kc)
-          kc=p_GetExp(p,j, currRing);
-        if(p_GetExp(p,j, currRing)>kr)
-          kr=p_GetExp(p,j, currRing);
+      for (j=currRing->N;j>0;j--)
+      {
+        long t=p_GetExp(p,j, currRing);
+        if(t /*p_GetExp(p,j, currRing)*/ >kc)
+          kc=t; /*p_GetExp(p,j, currRing);*/
+        if(t /*p_GetExp(p,j, currRing)s*/ >kr)
+          kr=t; /*p_GetExp(p,j, currRing);*/
       }
       r[k] = kr;