Changeset 3aab7b in git

Timestamp:

Jun 25, 2008, 5:37:25 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

19d1fac34461d4e329153e0e8bc2a41090b7e60e

Parents:

17c0fde8f413be9755c6ad3adfaf7e2c678775dc

Message:

*hannes: rAssure_Tdegree and opt.


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

File:

• kernel/ring.cc (modified) (36 diffs)

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.84 2008-06-19 12:39:56 wienand Exp $ */
+/* $Id: ring.cc,v 1.85 2008-06-25 15:37:25 Singular Exp $ */
 
 /*
@@ -1058 +1058 @@
 #ifdef HAVE_PLURAL
       && !rIsPluralRing(r1) && !rIsPluralRing(r2)
-#endif      
+#endif
      )
   {
@@ -1190 +1190 @@
     {
       int b=rBlocks(r1);
-  
+
       tmpR.order=(int*)omAlloc0(b*sizeof(int));
       tmpR.block0=(int*)omAlloc0(b*sizeof(int));
@@ -1313 +1313 @@
       idTest((ideal)D);
 
- 
+
       for (i=1; i<= rVar(R2); i++)
         for (j=i+1; j<=rVar(R2); j++)
@@ -1339 +1339 @@
 
       Print("\nRefs: R1: %d, R2: %d\n", R1->GetNC()->ref, R2->GetNC()->ref);
-      
-#endif
-#endif
-
-          
+
+#endif
+#endif
+
+
       rDelete(R1);
       rDelete(R2);
@@ -1355 +1355 @@
       rChangeCurrRing(old_ring);
     }
-  
+
   }
 #endif
@@ -2445 +2445 @@
   res->GetNC() = NULL;
 #endif
-  
+
   // res->qideal, res->idroot ???
   res->wvhdl=wvhdl;
@@ -2496 +2496 @@
       WarnS("error in nc_rComplete");
       // cleanup?
-      
+
 //      rDelete(res);
 //      return r;
@@ -2504 +2504 @@
   }
 #endif
-  
+
   return res;
 }
@@ -2516 +2516 @@
   res->GetNC() = NULL;
 #endif
-  
+
   /*weights: entries for 3 blocks: NULL*/
   res->wvhdl = (int **)omAlloc0(3 * sizeof(int_ptr));
@@ -2587 +2587 @@
 #ifdef HAVE_PLURAL
     res->GetNC() = NULL;
-#endif    
+#endif
     // res->qideal, res->idroot ???
     res->wvhdl=wvhdl;
@@ -3693 +3693 @@
 #endif
 #endif
-    
+
 
     if (old_ring->qideal != NULL)
@@ -3704 +3704 @@
       if( rIsPluralRing(r) )
         nc_SetupQuotient(r);
-#endif      
+#endif
     }
   }
@@ -3718 +3718 @@
 #endif
 #endif
-      
+
   return r;
 }
@@ -3729 +3729 @@
   int j;
 
-  res->order=(int *)omAlloc0((i+1)*sizeof(int));
-  for(j=i;j>0;j--) res->order[j]=r->order[j-1];
-  res->order[0]=ringorder_s;
-
+  res->order=(int *)omAlloc((i+1)*sizeof(int));
   res->block0=(int *)omAlloc0((i+1)*sizeof(int));
-  for(j=i;j>0;j--) res->block0[j]=r->block0[j-1];
-
   res->block1=(int *)omAlloc0((i+1)*sizeof(int));
-  for(j=i;j>0;j--) res->block1[j]=r->block1[j-1];
-
   int ** wvhdl =(int **)omAlloc0((i+1)*sizeof(int**));
   for(j=i;j>0;j--)
   {
+    res->order[j]=r->order[j-1];
+    res->block0[j]=r->block0[j-1];
+    res->block1[j]=r->block1[j-1];
     if (r->wvhdl[j-1] != NULL)
     {
@@ -3747 +3743 @@
     }
   }
+  res->order[0]=ringorder_s;
+
   res->wvhdl = wvhdl;
 
@@ -3768 +3766 @@
     }
 #endif
-    
-  }
+
+  }
+  return res;
+}
+
+ring rAssure_TDeg(ring r, int start_var, int end_var, int &pos)
+{
+  int i;
+  for(i=r->OrdSize;i>=0;i--)
+  {
+    if ((r->typ[i].ord_typ==ro_dp)
+    && (r->typ[i].data.dp.start==start_var)
+    && (r->typ[i].data.dp.end==end_var))
+    {
+      pos=r->typ[i].data.dp.place;
+      return r;
+    }
+  }
+  ring res=rCopy0(r, FALSE, FALSE);
+  i=rBlocks(r);
+  int j;
+
+  res->order=(int *)omMemDup(r->order);
+  res->block0=(int *)omMemDup(r->block0);
+  res->block1=(int *)omMemDup(r->block1);
+  int ** wvhdl =(int **)omAlloc0(i*sizeof(int**));
+  for(j=i-1;j>=0;j--)
+  {
+    if (r->wvhdl[j] != NULL)
+    {
+      wvhdl[j] = (int*) omMemDup(r->wvhdl[j-1]);
+    }
+  }
+  res->wvhdl = wvhdl;
+
+  res->ExpL_Size=r->ExpL_Size+1; // one word more in each monom
+  res->CmpL_Size=r->CmpL_Size;
+  res->PolyBin=omGetSpecBin(POLYSIZE + (res->ExpL_Size)*sizeof(long));
+  res->ordsgn=(long *)omAlloc0(res->ExpL_Size*sizeof(long));
+  for(j=0;j<r->CmpL_Size;j++)
+  {
+    res->ordsgn[j] = r->ordsgn[j];
+  }
+  res->OrdSize=r->OrdSize+1;   // one block more for pSetm
+  res->typ=(sro_ord*)omAlloc(res->OrdSize*sizeof(sro_ord));
+  if (r->typ!=NULL)
+    memcpy(res->typ,r->typ,r->OrdSize*sizeof(sro_ord));
+  // the additionla block for pSetm: total degree at the last word
+  // but not included in the compare part
+  res->typ[res->OrdSize].ord_typ=ro_dp;
+  res->typ[res->OrdSize].data.dp.start=start_var;
+  res->typ[res->OrdSize].data.dp.end=end_var;
+  res->typ[res->OrdSize].data.dp.place=res->ExpL_Size-1;
+  pos=res->ExpL_Size-1;
+#ifdef HAVE_PLURAL
+  if (rIsPluralRing(res))
+  {
+    if ( nc_rComplete(r, res, false) ) // no qideal!
+    {
+      WarnS("error in nc_rComplete");
+    // just go on..
+    }
+  }
+#endif
   return res;
 }
@@ -3778 +3838 @@
   int i=0;
   do
-  { 
+  {
      if (r->order[i] == ringorder_c ||
         r->order[i] == ringorder_C) return r;
@@ -3787 +3847 @@
   //WarnS("re-creating ring with comps");
   last_block=i-1;
-  
+
   ring new_r = rCopy0(r, FALSE, FALSE);
   i+=2;
@@ -3806 +3866 @@
   last_block++;
   new_r->order[last_block]=ringorder_C;
-  new_r->block0[last_block]=0;
-  new_r->block1[last_block]=0;
+  //new_r->block0[last_block]=0;
+  //new_r->block1[last_block]=0;
   //new_r->wvhdl[last_block]=NULL;
 
@@ -3827 +3887 @@
   }
 #endif
-  
+
   return new_r;
 }
@@ -3881 +3941 @@
         }
 #endif
-        
+
       }
       return new_r;
@@ -3930 +3990 @@
     }
 #endif
-   
+
     rChangeCurrRing(new_r);
     if (old_r->qideal != NULL)
@@ -3941 +4001 @@
         nc_SetupQuotient( new_r );
 #endif
-      
+
     }
     rTest(new_r);
@@ -4171 +4231 @@
   ring save = currRing;
   rChangeCurrRing(src);
-  
+
   ring r = rCopy0(src,TRUE); /* TRUE for copy the qideal */
   /*  rChangeCurrRing(r); */
@@ -4382 +4442 @@
   rComplete(r);
 
-  
+
 #ifdef RDEBUG
   //   rDebugPrint(r);
@@ -4388 +4448 @@
 #endif
 
-  rChangeCurrRing(r); 
+  rChangeCurrRing(r);
 
 #ifdef HAVE_PLURAL
@@ -4395 +4455 @@
   {
     assume( currRing == r);
-    
+
     int *perm       = (int *)omAlloc0((rVar(r)+1)*sizeof(int));
     int *par_perm   = NULL;
@@ -4434 +4494 @@
     omFreeSize((ADDRESS)perm,(rVar(r)+1)*sizeof(int));
 
-    rChangeCurrRing(save); 
-  
+    rChangeCurrRing(save);
+
   }
 #endif /* HAVE_PLURAL */
@@ -4472 +4532 @@
 
 #ifdef HAVE_PLURAL
-BOOLEAN nc_rComplete(const ring src, ring dest, bool bSetupQuotient) 
+BOOLEAN nc_rComplete(const ring src, ring dest, bool bSetupQuotient)
 /* returns TRUE is there were errors */
 /* dest is actualy equals src with the different ordering */
@@ -4481 +4541 @@
 // ring created by dirty hack (without nc_CallPlural)
 
-  assume(!rIsPluralRing(dest)); // destination must be a newly constructed commutative ring 
+  assume(!rIsPluralRing(dest)); // destination must be a newly constructed commutative ring
 
   if (!rIsPluralRing(src))
@@ -4498 +4558 @@
 
   const ring srcBase = src->GetNC()->basering;
-  
+
   assume( nSetMap(srcBase) == nSetMap(currRing) ); // currRing is important here!
-  
+
   matrix C = mpNew(N,N); // ring independent
   matrix D = mpNew(N,N);
@@ -4520 +4580 @@
       MATELEM(C,i,j) = p;
       if (MATELEM(D0,i,j) != NULL)
-        MATELEM(D,i,j) = prCopyR(MATELEM(D0,i,j), srcBase, dest); // ? 
+        MATELEM(D,i,j) = prCopyR(MATELEM(D0,i,j), srcBase, dest); // ?
     }
   }
   /* One must test C and D _only_ in r->GetNC()->basering!!! not in r!!! */
-  
+
   idTest((ideal)C); // in dest!
   idTest((ideal)D);
@@ -4530 +4590 @@
   if (nc_CallPlural(C, D, NULL, NULL, dest, bSetupQuotient, false, true, dest)) // also takes care about quotient ideal
   {
-    //WarnS("Error transferring non-commutative structure"); 
+    //WarnS("Error transferring non-commutative structure");
     // error message should be in the interpreter interface
 
@@ -4538 +4598 @@
     if (currRing != save)
        rChangeCurrRing(save);
-    
+
     return TRUE;
   }
-  
+
 //  mpDelete(&C, dest); // used by nc_CallPlural!
 //  mpDelete(&D, dest);
@@ -4547 +4607 @@
   if (dest != save)
     rChangeCurrRing(save);
-  
+
   return FALSE;
 }