Changeset dd8182 in git

Timestamp:

May 28, 2015, 1:49:46 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'a7324b6e0b44a1a8ed3fa4d9ca3e2ff210ddd52c')

Children:

37118282b339c44c8ed29fe938c803f9a24fcfec

Parents:

f255f00715b2e38983ecf37e5ec5aaea460c09d8

Message:

fix: id_Mult (Tst/Buch?Example_1_8_2)

File:

• libpolys/polys/simpleideals.cc (modified) (30 diffs)

libpolys/polys/simpleideals.cc

@@ -39 +39 @@
 {
   assume( idsize >= 0 && rank >= 0 );
-  
+
   ideal hh = (ideal)omAllocBin(sip_sideal_bin);
 
@@ -45 +45 @@
   hh->nrows = 1; // ideal/module!
 
-  hh->rank = rank; // ideal: 1, module: >= 0! 
-  
+  hh->rank = rank; // ideal: 1, module: >= 0!
+
   if (idsize>0)
     hh->m = (poly *)omAlloc0(idsize*sizeof(poly));
   else
     hh->m = NULL;
-  
+
   return hh;
 }
@@ -101 +101 @@
 ideal id_MaxIdeal (const ring r)
 {
-  const int N = rVar(r);
-  ideal hh = idInit(N, 1);
-  for (int l=0; l < N; l++)
+  ideal hh = idInit(rVar(r), 1);
+  for (int l=rVar(r)-1; l>=0; l--)
   {
     hh->m[l] = p_One(r);
@@ -120 +119 @@
 
   id_Test(*h, r);
-  
+
   const int elems = (*h)->nrows * (*h)->ncols;
 
@@ -126 +125 @@
   {
     assume( (*h)->m != NULL );
-    
+
     int j = elems;
     do
@@ -134 +133 @@
       if (pp!=NULL) p_Delete(&pp, r);
     }
-    while (j>0);    
-    
+    while (j>0);
+
     omFreeSize((ADDRESS)((*h)->m),sizeof(poly)*elems);
   }
-  
+
   omFreeBin((ADDRESS)*h, sip_sideal_bin);
   *h=NULL;
@@ -148 +147 @@
 {
   id_Test(*h, r);
-  
+
   if (*h == NULL)
     return;
-  
+
   int j,elems;
   elems=j=(*h)->nrows*(*h)->ncols;
@@ -172 +171 @@
 {
   assume (ide != NULL);
-  
+
   int k;
   int j = -1;
-  BOOLEAN change=FALSE;  
-  
+  BOOLEAN change=FALSE;
+
   for (k=0; k<IDELEMS(ide); k++)
   {
@@ -210 +209 @@
 {
   assume (F != NULL);
-  
+
   int i=0,j=IDELEMS(F)-1;
 
@@ -227 +226 @@
 {
   id_Test(ide, r);
-  
+
   assume( ide != NULL );
   assume( k <= IDELEMS(ide) );
-  
+
   ideal newI = idInit(k, ide->rank);
-  
+
   for (int i = 0; i < k; i++)
     newI->m[i] = p_Copy(ide->m[i],r);
-  
+
   return newI;
 }
@@ -347 +346 @@
 {
   id_Test(id, r);
-  
+
   int i, j;
   int k = IDELEMS(id)-1;
@@ -398 +397 @@
 {
   id_Test(id, r);
-  
+
   for (int k = IDELEMS(id)-1; k>=0; k--)
   {
@@ -423 +422 @@
 {
   if (h1 != NULL)
-  {  
+  {
     // assume(IDELEMS(h1) > 0); for ideal/module, does not apply to matrix
     omCheckAddrSize(h1,sizeof(*h1));
@@ -429 +428 @@
     assume( h1->ncols >= 0 );
     assume( h1->nrows >= 0 ); // matrix case!
-    
+
     assume( h1->rank >= 0 );
 
@@ -438 +437 @@
     if( h1->m != NULL && n > 0 )
       omdebugAddrSize(h1->m, n * sizeof(poly));
-    
+
     long new_rk = 0; // inlining id_RankFreeModule(h1, r, tailRing);
 
@@ -451 +450 @@
     // dense matrices only contain polynomials:
     // h1->nrows == h1->rank > 1 && new_rk == 0!
-    assume( !( h1->nrows == h1->rank && h1->nrows > 1 && new_rk > 0 ) ); // 
-    
+    assume( !( h1->nrows == h1->rank && h1->nrows > 1 && new_rk > 0 ) ); //
+
     if(new_rk > h1->rank)
     {
@@ -603 +602 @@
   id_Test(h1, R);
   id_Test(h2, R);
-  
+
   if ( idIs0(h1) ) return id_Copy(h2,R);
   if ( idIs0(h2) ) return id_Copy(h1,R);
@@ -609 +608 @@
   int j = IDELEMS(h1)-1;
   while ((j >= 0) && (h1->m[j] == NULL)) j--;
-  
+
   int i = IDELEMS(h2)-1;
   while ((i >= 0) && (h2->m[i] == NULL)) i--;
-  
+
   const int r = si_max(h1->rank, h2->rank);
-  
+
   ideal result = idInit(i+j+2,r);
 
   int l;
-  
+
   for (l=j; l>=0; l--)
     result->m[l] = p_Copy(h1->m[l],R);
-  
+
   j = i+j+1;
   for (l=i; l>=0; l--, j--)
     result->m[j] = p_Copy(h2->m[l],R);
-  
+
   return result;
 }
@@ -635 +634 @@
   if (h2==NULL) return FALSE;
   assume (h1 != NULL);
-  
+
   int j = IDELEMS(h1) - 1;
-  
+
   while ((j >= 0) && (h1->m[j] == NULL)) j--;
   j++;
@@ -695 +694 @@
 
 /// h1 * h2
-/// h1 must be an ideal (with at least one column)
-/// h2 may be a module (with no columns at all)
-ideal  id_Mult (ideal h1,ideal  h2, const ring r)
-{
-  id_Test(h1, r);
-  id_Test(h2, r);
-
-  assume( h1->rank == 1 );
+/// one h_i must be an ideal (with at least one column)
+/// the other h_i may be a module (with no columns at all)
+ideal  id_Mult (ideal h1,ideal  h2, const ring R)
+{
+  id_Test(h1, R);
+  id_Test(h2, R);
 
   int j = IDELEMS(h1);
   while ((j > 0) && (h1->m[j-1] == NULL)) j--;
-  
+
   int i = IDELEMS(h2);
   while ((i > 0) && (h2->m[i-1] == NULL)) i--;
 
-  j = j * i;
-  
-  ideal  hh = idInit(j, si_max( h2->rank, h1->rank ));
-  
-  if (j==0) return hh;
-  
+  j *= i;
+  int r = si_max( h2->rank, h1->rank );
+  if (j==0)
+  {
+    if ((IDELEMS(h1)>0) && (IDELEMS(h2)>0)) j=1;
+    return idInit(j, r);
+  }
+  ideal  hh = idInit(j, r);
+
   int k = 0;
   for (i=0; i<IDELEMS(h1); i++)
@@ -725 +725 @@
         if (h2->m[j] != NULL)
         {
-          hh->m[k] = pp_Mult_qq(h1->m[i],h2->m[j],r);
+          hh->m[k] = pp_Mult_qq(h1->m[i],h2->m[j],R);
           k++;
         }
@@ -731 +731 @@
     }
   }
-  
-  id_Compactify(hh,r);
+
+  id_Compactify(hh,R);
   return hh;
 }
@@ -741 +741 @@
   assume (h != NULL); // will fail :(
 //  if (h == NULL) return TRUE;
-  
-  for( int i = IDELEMS(h)-1; i >= 0; i-- )    
+
+  for( int i = IDELEMS(h)-1; i >= 0; i-- )
     if(h->m[i] != NULL)
       return FALSE;
@@ -754 +754 @@
 {
   id_TestTail(s, lmRing, tailRing);
-  
+
   long j = 0;
 
@@ -768 +768 @@
       }
   }
-  
+
   return j; //  return -1;
 }
@@ -908 +908 @@
   assume(i >= 0);
   ideal h = idInit(i, i);
-  
+
   for (int j=0; j<i; j++)
   {
@@ -915 +915 @@
     p_SetmComp(h->m[j],r);
   }
-  
+
   return h;
 }
@@ -1087 +1087 @@
     if (h->m[i]!=NULL)
       m->m[i]=p_Head(h->m[i],r);
-  
+
   return m;
 }
@@ -1375 +1375 @@
   r->ncols = i-> ncols;
   //r->rank = i-> rank;
-  
+
   for(int k=(i->nrows)*(i->ncols)-1;k>=0; k--)
     r->m[k]=pp_Jet(i->m[k],d,R);
-  
+
   return r;
 }
@@ -1743 +1743 @@
 
 //  assume( s >= 0 ); // negative is also possible // TODO: verify input ideal in such a case!?
-  
+
   for(int i=IDELEMS(M)-1; i>=0;i--)
     p_Shift(&(M->m[i]),s,r);
-  
+
   M->rank += s;
-  
+
 //  id_Test( M, r );
 }