Changeset 45df3d0 in git

Timestamp:

Mar 28, 2011, 2:47:59 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

2de414537b02c8a83e023a3ca0ed0ac73bf7164c

Parents:

f97705b0f28d859734876fd55a7115c409a8b5c8

Message:

idSectWithElim

git-svn-id: file:///usr/local/Singular/svn/trunk@14074 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• ideals.cc (modified) (2 diffs)
• matpol.cc (modified) (2 diffs)

kernel/ideals.cc

@@ -1156 +1156 @@
 }
 
+ideal idSectWithElim (ideal h1,ideal h2)
+// does not destroy h1,h2
+{
+  assume(!idIs0(h1));
+  assume(!idIs0(h2));
+  assume(IDELEMS(h1)<=IDELEMS(h2));
+  assume(idRankFreeModule(h1)==0);
+  assume(idRankFreeModule(h2)==0);
+  // add a new variable:
+  int j;
+  ring origRing=currRing;
+  ring r=rCopy0(origRing);
+  r->N++;
+  r->block0[0]=1;
+  r->block1[0]= r->N;
+  omFree(r->order);
+  r->order=(int*)omAlloc0(3*sizeof(int*));
+  r->order[0]=ringorder_dp;
+  r->order[1]=ringorder_C;
+  char **names=(char**)omAlloc0(rVar(r) * sizeof(char_ptr));
+  for (j=0;j<r->N-1;j++) names[j]=r->names[j];
+  names[r->N-1]=omStrDup("@");
+  omFree(r->names);
+  r->names=names;
+  rComplete(r,TRUE);
+  // fetch h1, h2
+  ideal h;
+  h1=idrCopyR(h1,origRing,r);
+  h2=idrCopyR(h2,origRing,r);
+  // switch to temp. ring r
+  rChangeCurrRing(r);
+  // create 1-t, t
+  poly omt=pOne();
+  pSetExp(omt,r->N,1);
+  poly t=pCopy(omt);
+  pSetm(omt);
+  omt=pNeg(omt);
+  omt=pAdd(omt,pOne());
+  // compute (1-t)*h1
+  h1=(ideal)mpMultP((matrix)h1,omt);
+  // compute t*h2
+  h2=(ideal)mpMultP((matrix)h2,pCopy(t));
+  // (1-t)h1 + t*h2
+  h=idInit(IDELEMS(h1)+IDELEMS(h2),1);
+  int l;
+  for (l=IDELEMS(h1)-1; l>=0; l--)
+  {
+    h->m[l] = h1->m[l];  h1->m[l]=NULL;
+  }
+  j=IDELEMS(h1);
+  for (l=IDELEMS(h2)-1; l>=0; l--)
+  {
+    h->m[l+j] = h2->m[l];  h2->m[l]=NULL;
+  }
+  idDelete(&h1);
+  idDelete(&h2);
+  // eliminate t:
+
+  ideal res=idElimination(h,t);
+  // cleanup 
+  idDelete(&h);
+  res=idrMoveR(res,r,origRing);
+  rChangeCurrRing(origRing);
+  rKill(r);
+  return res;
+}
 /*2
 * h3 := h1 intersect h2
@@ -1184 +1250 @@
   if (length==0)
   {
-    length = 1;
+    if ((currQuotient==NULL)
+    && (currRing->OrdSgn==1)
+    && (!rIsPluralRing(currRing)))
+      return idSectWithElim(first,second);
+    else length = 1;
   }
   j = IDELEMS(first);

kernel/matpol.cc

@@ -1860 +1860 @@
         {
           if (div)
-            SM_DIV(q1, div);                                
+            SM_DIV(q1, div);
           q[j] = q1;
         }
@@ -1873 +1873 @@
           q1 = SM_MULT(a[j], piv, div);
           if (div)
-            SM_DIV(q1, div);                                
+            SM_DIV(q1, div);
           q[j] = q1;
         }