Changeset fa2599 in git

Timestamp:

Jun 28, 2018, 4:11:18 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

13673122266edb13d76ff215c7d27bf6d7aa7ce3

Parents:

c30f2a5c7c1e7bcaad9c89db8130f63e91fda6a9

Message:

add smatrix: system("flatten",A) resp. flatten(A)

Files:

• Singular/LIB/matrix.lib (modified) (2 diffs)
• Singular/extra.cc (modified) (1 diff)
• libpolys/polys/matpol.cc (modified) (1 diff)
• libpolys/polys/matpol.h (modified) (1 diff)

Singular/LIB/matrix.lib

@@ -175 +175 @@
 
 proc flatten (def A)
-"USAGE:   flatten(A); A matrix
-RETURN:  ideal, generated by all entries from A
+"USAGE:   flatten(A); A matrix/smatrix
+RETURN:  ideal, generated by all entries from A resp. all colums of A appended
 EXAMPLE: example flatten; shows an example
 "
 {
+   if (typeof(A)=="smatrix") {return system("flatten",A); }
    return(ideal(A));
 }
@@ -188 +189 @@
    print(A);
    flatten(A);
+   flatten(smatrix(A));
 }
 ///////////////////////////////////////////////////////////////////////////////

Singular/extra.cc

@@ -316 +316 @@
       }
       return TRUE;
+    }
+    else
+  /*==================== flatten =============================*/
+    if(strcmp(sys_cmd,"flatten")==0)
+    {
+      if ((h!=NULL) &&(h->Typ()==SMATRIX_CMD))
+      {
+        res->data=(char*)sm_Flatten((ideal)h->Data(),currRing);
+        res->rtyp=SMATRIX_CMD;
+        return FALSE;
+      }
+      else
+        WerrorS("smatrix expected");
     }
     else

libpolys/polys/matpol.cc

@@ -1824 +1824 @@
 }
 
+ideal sm_Flatten(ideal a, const ring R)
+{
+  if (IDELEMS(a)==0) return id_Copy(a,R);
+  ideal res=idInit(1,IDELEMS(a)*a->rank);
+  for(int i=0;i<IDELEMS(a);i++)
+  {
+    if(a->m[i]!=NULL)
+    {
+      poly p=p_Copy(a->m[i],R);
+      if (i==0) res->m[0]=p;
+      else
+      {
+        p_Shift(&p,i*a->rank,R);
+        res->m[0]=p_Add_q(res->m[0],p,R);
+      }
+    }
+  }
+  return res;
+}
 /*2
 *returns the trace of matrix a

libpolys/polys/matpol.h

@@ -98 +98 @@
 ideal sm_Sub(ideal a, ideal b, const ring R);
 ideal sm_Mult(ideal a, ideal b, const ring R);
+ideal sm_Flatten(ideal a, const ring R);
 poly sm_Trace ( ideal a, const ring R);
 int sm_Compare(ideal a, ideal b, const ring R);