Changeset dd930e5 in git

Timestamp:

Sep 9, 2016, 2:43:10 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

1ca2af82a3bd8eac81ea5d1768cd152322082b89

Parents:

8222d62826a4a1e61a9e22bfbb98e742f896d780

Message:

add: mp_Compare

Location:

libpolys/polys

Files:

• matpol.cc (modified) (2 diffs)
• matpol.h (modified) (1 diff)

libpolys/polys/matpol.cc

@@ -574 +574 @@
     v = v->next;
   }
-}
-
-
-BOOLEAN mp_Equal(matrix a, matrix b, const ring R)
-{
-  if ((MATCOLS(a)!=MATCOLS(b)) || (MATROWS(a)!=MATROWS(b)))
-    return FALSE;
-  int i=MATCOLS(a)*MATROWS(b)-1;
-  while (i>=0)
-  {
-    if (a->m[i]==NULL)
-    {
-      if (b->m[i]!=NULL) return FALSE;
-    }
-    else
-      if (b->m[i]==NULL) return FALSE;
-      else if (p_Cmp(a->m[i],b->m[i], R)!=0) return FALSE;
-    i--;
-  }
-  i=MATCOLS(a)*MATROWS(b)-1;
-  while (i>=0)
-  {
-#if 0
-    poly tt=p_Sub(p_Copy(a->m[i], R),p_Copy(b->m[i], R), R);
-    if (tt!=NULL)
-    {
-      p_Delete(&tt, R);
-      return FALSE;
-    }
-#else
-    if(!p_EqualPolys(a->m[i],b->m[i], R)) return FALSE;
-#endif
-    i--;
-  }
-  return TRUE;
 }
 
@@ -1703 +1668 @@
   return (result);
 }
+int mp_Compare(matrix a, matrix b, const ring R)
+{
+  if (MATCOLS(a)<MATCOLS(b)) return -1;
+  else if (MATCOLS(a)>MATCOLS(b)) return 1;
+  if (MATROWS(a)<MATROWS(b)) return -1;
+  else if (MATROWS(a)<MATROWS(b)) return 1;
+
+  int i=MATCOLS(a)*MATROWS(b)-1;
+  int c;
+  while (i>=0)
+  {
+    if (a->m[i]==NULL)
+    {
+      if (b->m[i]!=NULL) return -1;
+    }
+    else
+      if (b->m[i]==NULL) return 1;
+      else if ((c=p_Cmp(a->m[i],b->m[i], R))!=0) return c;
+    i--;
+  }
+  unsigned ii=MATCOLS(a)*MATROWS(b)-1;
+  unsigned j=0;
+  int r=0;
+  while (j<=ii)
+  {
+    r=p_Compare(a->m[j],b->m[j],R);
+    if (r!=0) return r;
+    j++;
+  }
+  return r;
+}
+
+BOOLEAN mp_Equal(matrix a, matrix b, const ring R)
+{
+  int r=mp_Compare(a,b,R);
+  return (r==0);
+}
+

libpolys/polys/matpol.h

@@ -93 +93 @@
 extern omBin ip_smatrix_bin;
 
+int mp_Compare(matrix a, matrix b, const ring r);
 #endif/* MATPOL_H */