Changeset 8f963e in git

Timestamp:

Mar 3, 2017, 10:07:48 AM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

814a65342deba6307f8681b5318b625767ed2bc9

Parents:

77ba486a2bb537dad7c328a5710ec099c240c06f

Message:

opt: mp_Tesnsor

Files:

• Singular/extra.cc (modified) (1 diff)
• libpolys/polys/matpol.cc (modified) (3 diffs)

Singular/extra.cc

@@ -3837 +3837 @@
     if(strcmp(sys_cmd,"tensor")==0)
     {
-      if ((h->Typ()==MODUL_CMD)
-      && (h->next!=NULL)
-      && (h->next->Typ()==MODUL_CMD))
+      const short t[]={2,MODUL_CMD,MODUL_CMD};
+      if (iiCheckTypes(h,t,1))
       {
         res->data=(void*)mp_Tensor((ideal)h->Data(),(ideal)h->next->Data(),currRing);
-        res->rtyp=MODUL_CMD;
-        return FALSE;
+        res->rtyp=MODUL_CMD;
+        return FALSE;
       }
       else

libpolys/polys/matpol.cc

@@ -1725 +1725 @@
   }
 }
-
+// helper for mp_Tensor
+// destroyes f, keeps B
 static ideal mp_MultAndShift(poly f, ideal B, int s, const ring r)
 {
+  assume(f!=NULL);
   ideal res=idInit(IDELEMS(B),B->rank+s);
-  if (f!=NULL)
-  {
-    int q=IDELEMS(B); // p x q
-    for(int j=0;j<q;j++)
-    {
-      poly h=pp_Mult_qq(f,B->m[j],r);
-      if (h!=NULL)
-      {
-        if (s>0) p_Shift(&h,s,r);
-        res->m[j]=h;
-      }
-    }
-  }
+  int q=IDELEMS(B); // p x q
+  for(int j=0;j<q;j++)
+  {
+    poly h=pp_Mult_qq(f,B->m[j],r);
+    if (h!=NULL)
+    {
+      if (s>0) p_Shift(&h,s,r);
+      res->m[j]=h;
+    }
+  }
+  p_Delete(&f,r);
   return res;
 }
-static ideal mp_AddSubMat(ideal res, ideal sm, int col, const ring r)
+// helper for mp_Tensor
+// updates res, destroyes contents of sm
+static void mp_AddSubMat(ideal res, ideal sm, int col, const ring r)
 {
   for(int i=0;i<IDELEMS(sm);i++)
@@ -1751 +1753 @@
     sm->m[i]=NULL;
   }
-  return res;
 }
 
@@ -1762 +1763 @@
   int p=B->rank;
   ideal res=idInit(n*q,m*p);
-  poly *a=(poly*)omAlloc0(m*sizeof(poly));
+  poly *a=(poly*)omAlloc(m*sizeof(poly));
   for(int i=0; i<n; i++)
   {
+    memset(a,0,m*sizeof(poly));
     p_DecomposeComp(p_Copy(A->m[i],r),a,m,r);
     for(int j=0;j<m;j++)
     {
-      ideal sm=mp_MultAndShift(a[j], // A_i_j
-                               B,
-                               j*p, // shift j*p down
-                               r);
-      res=mp_AddSubMat(res,sm,i*q,r); // add this colums to col i*q ff
-      id_Delete(&sm,r);
-    }
-    memset(a,0,m*sizeof(poly));
+      if (a[j]!=NULL)
+      {
+        ideal sm=mp_MultAndShift(a[j], // A_i_j
+                                 B,
+                                 j*p, // shift j*p down
+                                 r);
+        mp_AddSubMat(res,sm,i*q,r); // add this columns to col i*q ff
+        id_Delete(&sm,r); // delete the now empty ideal
+      }
+    }
   }
   omFreeSize(a,m*sizeof(poly));