Changeset 2ffd25 in git for Singular/iparith.cc

Timestamp:

Jun 14, 2018, 2:59:48 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

1f37c3385e83e4bc34dab711cc9b9797b6290c84

Parents:

db48f3ea705fcb451c2ea640a2b72f643bae2f22

Message:

introduce smatrix (sparse matrix)

File:

• Singular/iparith.cc (modified) (5 diffs)

Singular/iparith.cc

@@ -834 +834 @@
   return jjPLUSMINUS_Gen(res,u,v);
 }
+static BOOLEAN jjPLUS_SM(leftv res, leftv u, leftv v)
+{
+  ideal A=(ideal)u->Data(); ideal B=(ideal)v->Data();
+  res->data = (char *)(sm_Add(A , B, currRing));
+  if (res->data==NULL)
+  {
+     Werror("matrix size not compatible(%dx%d, %dx%d)",
+             (int)A->rank,IDELEMS(A),(int)B->rank,IDELEMS(B));
+     return TRUE;
+  }
+  return jjPLUSMINUS_Gen(res,u,v);
+}
 static BOOLEAN jjPLUS_MA_P(leftv res, leftv u, leftv v)
 {
@@ -951 +963 @@
   return FALSE;
 }
+static BOOLEAN jjMINUS_SM(leftv res, leftv u, leftv v)
+{
+  ideal A=(ideal)u->Data(); ideal B=(ideal)v->Data();
+  res->data = (char *)(sm_Sub(A , B, currRing));
+  if (res->data==NULL)
+  {
+     Werror("matrix size not compatible(%dx%d, %dx%d)",
+             (int)A->rank,IDELEMS(A),(int)B->rank,IDELEMS(B));
+     return TRUE;
+  }
+  return jjPLUSMINUS_Gen(res,u,v);
+  return FALSE;
+}
 static BOOLEAN jjTIMES_I(leftv res, leftv u, leftv v)
 {
@@ -1130 +1155 @@
   return FALSE;
 }
+static BOOLEAN jjTIMES_SM(leftv res, leftv u, leftv v)
+{
+  ideal A=(ideal)u->Data(); ideal B=(ideal)v->Data();
+  res->data = (char *)sm_Mult(A,B,currRing);
+  if (res->data==NULL)
+  {
+     Werror("matrix size not compatible(%dx%d, %dx%d) in *",
+             (int)A->rank,IDELEMS(A),(int)B->rank,IDELEMS(B));
+     return TRUE;
+  }
+  id_Normalize((ideal)res->data,currRing);
+  if ((v->next!=NULL) || (u->next!=NULL))
+    return jjOP_REST(res,u,v);
+  return FALSE;
+}
 static BOOLEAN jjGE_BI(leftv res, leftv u, leftv v)
 {
@@ -1294 +1334 @@
 {
   res->data = (char *)((long)mp_Equal((matrix)u->Data(),(matrix)v->Data(),currRing));
+  jjEQUAL_REST(res,u,v);
+  return FALSE;
+}
+static BOOLEAN jjEQUAL_SM(leftv res, leftv u, leftv v)
+{
+  res->data = (char *)((long)sm_Equal((ideal)u->Data(),(ideal)v->Data(),currRing));
   jjEQUAL_REST(res,u,v);
   return FALSE;
@@ -5431 +5477 @@
     Werror("wrong range[%d,%d] in matrix %s(%d x %d)",r,c,u->Fullname(),
       MATROWS(m),MATCOLS(m));
+    return TRUE;
+  }
+  res->data=u->data; u->data=NULL;
+  res->rtyp=u->rtyp; u->rtyp=0;
+  res->name=u->name; u->name=NULL;
+  Subexpr e=jjMakeSub(v);
+          e->next=jjMakeSub(w);
+  if (u->e==NULL)
+    res->e=e;
+  else
+  {
+    Subexpr h=u->e;
+    while (h->next!=NULL) h=h->next;
+    h->next=e;
+    res->e=u->e;
+    u->e=NULL;
+  }
+  return FALSE;
+}
+static BOOLEAN jjBRACK_SM(leftv res, leftv u, leftv v,leftv w)
+{
+  ideal m= (ideal)u->Data();
+  int   r = (int)(long)v->Data();
+  int   c = (int)(long)w->Data();
+  //Print("gen. elem %d, %d\n",r,c);
+  if ((r<1)||(r>m->rank)||(c<1)||(c>IDELEMS(m)))
+  {
+    Werror("wrong range[%d,%d] in matrix %s(%d x %d)",r,c,u->Fullname(),
+      (int)m->rank,IDELEMS(m));
     return TRUE;
   }