Changeset f39f11f in git

Timestamp:

Jun 21, 2018, 11:04:44 AM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

ed085278a0d1c84d197cb3b6dea54a2e5cbabdc0

Parents:

1ac80422580a89e30cd4b9b54b5fd152a3173c47

Message:

add: smatrix(smatrix/module,rows,cols) resize smatrix

Location:

Singular

Files:

• iparith.cc (modified) (2 diffs)
• table.h (modified) (1 diff)

Singular/iparith.cc

@@ -6474 +6474 @@
   int mi=(int)(long)v->Data();
   int ni=(int)(long)w->Data();
-  if ((mi<1)||(ni<1))
+  if ((mi<0)||(ni<1))
   {
     Werror("converting module to matrix: dimensions must be positive(%dx%d)",mi,ni);
@@ -6507 +6507 @@
   id_Delete((ideal *)&I,currRing);
   res->data = (char *)m;
+  return FALSE;
+}
+static BOOLEAN jjSMATRIX_Mo(leftv res, leftv u, leftv v,leftv w)
+{
+  int mi=(int)(long)v->Data();
+  int ni=(int)(long)w->Data();
+  if ((mi<0)||(ni<1))
+  {
+    Werror("converting to smatrix: dimensions must be positive(%dx%d)",mi,ni);
+    return TRUE;
+  }
+  res->data = (char *)id_ResizeModule((ideal)u->CopyD(),
+           mi,ni,currRing);
   return FALSE;
 }

Singular/table.h

@@ -831 +831 @@
 ,{D(jjMATRIX_Mo),      MATRIX_CMD, MATRIX_CMD, MODUL_CMD,  INT_CMD,    INT_CMD, ALLOW_NC |ALLOW_RING}
 ,{D(jjMATRIX_Ma),      MATRIX_CMD, MATRIX_CMD, MATRIX_CMD, INT_CMD,    INT_CMD, ALLOW_NC |ALLOW_RING}
-//,{D(jjSMATRIX_Id),     SMATRIX_CMD,SMATRIX_CMD,IDEAL_CMD,  INT_CMD,    INT_CMD, ALLOW_NC |ALLOW_RING}
-//,{D(jjSMATRIX_Mo),     SMATRIX_CMD,SMATRIX_CMD,MODUL_CMD,  INT_CMD,    INT_CMD, ALLOW_NC |ALLOW_RING}
-//,{D(jjSMATRIX_Ma),     SMATRIX_CMD,SMATRIX_CMD,MATRIX_CMD, INT_CMD,    INT_CMD, ALLOW_NC |ALLOW_RING}
+,{D(jjSMATRIX_Mo),     SMATRIX_CMD,SMATRIX_CMD,MODUL_CMD,  INT_CMD,    INT_CMD, ALLOW_NC |ALLOW_RING}
+,{D(jjSMATRIX_Mo),     SMATRIX_CMD,SMATRIX_CMD,SMATRIX_CMD,INT_CMD,    INT_CMD, ALLOW_NC |ALLOW_RING}
 #ifdef OLD_RES
 ,{D(jjRES3),           MRES_CMD,   NONE,       IDEAL_CMD,  INT_CMD,    ANY_TYPE, ALLOW_PLURAL |ALLOW_RING}