Changeset 60d1183 in git

Timestamp:

Feb 1, 2008, 2:45:37 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

935bb1bf1fc7cf6828861ed659dcc18157c72dd3

Parents:

31e857fefc0db942580fac2470cb89c397ef32a8

Message:

*hannes: idSect re-organized


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

File:

• kernel/ideals.cc (modified) (7 diffs)

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.45 2007-06-14 14:56:40 Singular Exp $ */
+/* $Id: ideals.cc,v 1.46 2008-02-01 13:45:37 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -1029 +1029 @@
 ideal idSect (ideal h1,ideal h2)
 {
-  ideal first=h2,second=h1,temp,temp1,result;
-  int i,j,k,flength,slength,length,rank=si_min(h1->rank,h2->rank);
+  int i,j,k,length;
+  int flength = idRankFreeModule(h1);
+  int slength = idRankFreeModule(h2);
+  int rank=si_min(flength,slength);
+  if ((idIs0(h1)) || (idIs0(h2)))  return idInit(1,rank);
+
+  ideal first,second,temp,temp1,result;
   intvec *w;
   poly p,q;
 
-  if ((idIs0(h1)) && (idIs0(h2)))  return idInit(1,rank);
   if (IDELEMS(h1)<IDELEMS(h2))
   {
@@ -1040 +1044 @@
     second = h2;
   }
-  flength = idRankFreeModule(first);
-  slength = idRankFreeModule(second);
+  else
+  {
+    first = h2;
+    second = h1;
+    int t=flength; flength=slength; slength=t;
+  }
   length  = si_max(flength,slength);
   if (length==0)
@@ -1048 +1056 @@
   }
   j = IDELEMS(first);
-  temp = idInit(j /*IDELEMS(first)*/,length+j);
 
   ring orig_ring=currRing;
@@ -1055 +1062 @@
 
   while ((j>0) && (first->m[j-1]==NULL)) j--;
+  temp = idInit(j /*IDELEMS(first)*/+IDELEMS(second),length+j);
   k = 0;
   for (i=0;i<j;i++)
@@ -1074 +1082 @@
     }
   }
-  pEnlargeSet(&(temp->m),IDELEMS(temp),j+IDELEMS(second)-IDELEMS(temp));
-  IDELEMS(temp) = j+IDELEMS(second);
   for (i=0;i<IDELEMS(second);i++)
   {
@@ -1103 +1109 @@
     {
       if(syz_ring==orig_ring)
-        p = pCopy(temp1->m[i]);
+      {
+        p = temp1->m[i];
+      }
       else
-        p = prCopyR(temp1->m[i], syz_ring);
+      {
+        p = prMoveR(temp1->m[i], syz_ring);
+      }
+      temp1->m[i]=NULL;
       while (p!=NULL)
       {