Changeset 4b7db8 in git for Singular/ipshell.cc

Timestamp:

Oct 12, 2012, 12:44:08 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e2c21a2830ff139bc7175101732d2b833c240e49

Parents:

7ec05993a90b8b8d6cd1f03ce111460365a98194

Message:

fix: how to build ring from lists without order for components (rCompose)

File:

• Singular/ipshell.cc (modified) (3 diffs)

Singular/ipshell.cc

@@ -2130 +2130 @@
 }
 
-ring rCompose(const lists  L)
+ring rCompose(const lists  L, const BOOLEAN check_comp)
 {
   if ((L->nr!=3)
@@ -2208 +2208 @@
       if( R->cf == NULL )
       {
-        ring extRing = rCompose((lists)L->m[0].Data());
+        ring extRing = rCompose((lists)L->m[0].Data(),FALSE);
 
         if (extRing==NULL)
@@ -2449 +2449 @@
         Werror("ordering incomplete: size (%d) should be %d",R->block1[j],R->N);
         goto rCompose_err;
+      }
+    }
+    if (check_comp)
+    {
+      BOOLEAN comp_order=FALSE;
+      int jj;
+      for(jj=0;jj<n;jj++)
+      {
+        if ((R->order[jj]==ringorder_c) ||
+            (R->order[jj]==ringorder_C)) { comp_order=TRUE; break; }
+      }
+      if (!comp_order)
+      {
+        R->order=(int*)omRealloc0Size(R->order,n*sizeof(int),(n+1)*sizeof(int));
+        R->block0=(int*)omRealloc0Size(R->block0,n*sizeof(int),(n+1)*sizeof(int));
+        R->block1=(int*)omRealloc0Size(R->block1,n*sizeof(int),(n+1)*sizeof(int));
+        R->wvhdl=(int**)omRealloc0Size(R->wvhdl,n*sizeof(int_ptr),(n+1)*sizeof(int_ptr));
+        R->order[n-1]=ringorder_C;
+        R->block0[n-1]=0;
+        R->block1[n-1]=0;
+        R->wvhdl[n-1]=NULL;
+        n++;
       }
     }