Changeset 4c7d73 in git

Timestamp:

May 4, 2005, 5:25:46 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

28543b21d1a59aaa89526434e42b6376b8886667

Parents:

50c4143c24b16b5b07afa95f93b9bb62cd380180

Message:

*hannes: frwalk stuff


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

Location:

kernel

Files:

• Makefile.in (modified) (2 diffs)
• mod_raw.cc (modified) (2 diffs)
• ring.cc (modified) (14 diffs)
• ring.h (modified) (4 diffs)

kernel/Makefile.in

@@ -107 +107 @@
     timer.cc weight.cc \
     GMPrat.cc multicnt.cc npolygon.cc semic.cc spectrum.cc splist.cc \
-    mod_raw.cc sing_win.cc\
+    mod_raw.cc sing_win.cc walkProc.cc walkMain.cc walkSupport.cc\
     eigenval.cc units.cc kbuckets.cc sbuckets.cc\
     mpr_inout.cc mpr_base.cc mpr_numeric.cc \
@@ -150 +150 @@
         ring.h timer.h dError.h fast_maps.h \
         febase.h shortfl.h mpr_complex.h mpr_global.h \
-        gring.h \
+        gring.h walkProc.h walkMain.h walkSupport.h\
         ffields.h khstd.h sparsmat.h gnumpfl.h gnumpc.h \
         fglm.h kstd1.h modulop.h sing_dbm.h weight.h \

kernel/mod_raw.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mod_raw.cc,v 1.2 2004-08-13 10:40:53 Singular Exp $ */
+/* $Id: mod_raw.cc,v 1.3 2005-05-04 15:25:45 Singular Exp $ */
 /*
  * ABSTRACT: machine depend code for dynamic modules
@@ -9 +9 @@
  *           dynl_sym()
  *           dynl_error()
- *           dunl_close()
+ *           dynl_close()
 */
 

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.36 2005-05-04 14:13:16 Singular Exp $ */
+/* $Id: ring.cc,v 1.37 2005-05-04 15:25:45 Singular Exp $ */
 
 /*
@@ -294 +294 @@
     ||(r->order[l] == ringorder_M)
     ||(r->order[l] == ringorder_a)
+    ||(r->order[l] == ringorder_a64)
     ||(r->order[l] == ringorder_aa))
     {
@@ -319 +320 @@
         for (i = 0; i<=r->block1[l]-r->block0[l]; i++)
         {
-          Print("%*d " ,nlen,r->wvhdl[l][i+j],i+j);
+          if (r->order[l] == ringorder_a64)
+          { int64 *w=(int64 *)r->wvhdl[l];
+            Print("%*lld " ,nlen,w[i+j],i+j);
+          }
+          else
+            Print("%*d " ,nlen,r->wvhdl[l][i+j],i+j);
         }
         if (r->order[l]!=ringorder_M) break;
@@ -473 +479 @@
         {
           char c=',';
-          for (i = 0; i<r->block1[l]-r->block0[l]; i++)
+          if(r->order[l]==ringorder_a64)
           {
-            StringAppend("%d," ,r->wvhdl[l][i+j]);
+            int64 * w=(int64 *)r->wvhdl[l];
+            for (i = 0; i<r->block1[l]-r->block0[l]; i++)
+            {
+              StringAppend("%lld," ,w[i]);
+            }
+            StringAppend("%lld)" ,w[i]);
+            break;
+          }
+          else
+          {
+            for (i = 0; i<r->block1[l]-r->block0[l]; i++)
+            {
+              StringAppend("%d," ,r->wvhdl[l][i+j]);
+            }
           }
           if (r->order[l]!=ringorder_M)
@@ -1280 +1299 @@
  * DOES NOT CALL rComplete
  */
-static ring rCopy0(ring r, BOOLEAN copy_qideal = TRUE,
-                   BOOLEAN copy_ordering = TRUE)
+ring rCopy0(ring r, BOOLEAN copy_qideal, BOOLEAN copy_ordering)
 {
   if (r == NULL) return NULL;
@@ -1630 +1648 @@
         case ringorder_M:
           return 2; /*don't know*/
+        case ringorder_a64: /* assume: all weight are non-negative!*/
         case ringorder_lp:
         case ringorder_rp:
@@ -1825 +1844 @@
     }
   }
+}
+
+static void rO_WDegree64(int &place, int &bitplace, int start, int end,
+    long *o, sro_ord &ord_struct, int64 *weights)
+{
+  // weighted degree (aligned) of variables v_start..v_end, ordsgn 1,
+  // reserved 2 places
+  rO_Align(place,bitplace);
+  ord_struct.ord_typ=ro_wp64;
+  ord_struct.data.wp64.start=start;
+  ord_struct.data.wp64.end=end;
+  ord_struct.data.wp64.place=place;
+  ord_struct.data.wp64.weights64=weights;
+  o[place]=1;
+  place++;
+  o[place]=1;
+  place++;
+  rO_Align(place,bitplace);
+  int i;
 }
 
@@ -2402 +2440 @@
     case ringorder_a:
     case ringorder_aa:
+    case ringorder_a64:
       if (r->OrdSgn==-1) r->MixedOrder=TRUE;
       break;
@@ -2441 +2480 @@
   r->firstBlockEnds=block1[i];
   r->firstwv = wvhdl[i];
-  if ((order[i]== ringorder_ws) || (order[i]==ringorder_Ws))
+  if ((order[i]== ringorder_ws) || (order[i]==ringorder_Ws)
+  || (order[i]== ringorder_wp) || (order[i]==ringorder_Wp)
+  || (order[i]== ringorder_a) /*|| (order[i]==ringorder_A)*/)
   {
     int j;
     for(j=block1[i]-r->block0[i];j>=0;j--)
-      if (r->firstwv[j]<0) { r->MixedOrder=TRUE; break; }
+    {
+      if (r->firstwv[j]<0) r->MixedOrder=TRUE;
+      if (r->firstwv[j]==0) r->LexOrder=TRUE;
+    }
+  }
+  else if (order[i]==ringorder_a64)
+  {
+    int j;
+    int64 *w=rGetWeightVec(r);
+    for(j=block1[i]-r->block0[i];j>=0;j--)
+    {
+      if (w[j]==0) r->LexOrder=TRUE;
+    }
   }
 }
@@ -2679 +2732 @@
         break;
 
+      case ringorder_a64:
+        rO_WDegree64(j,j_bits,r->block0[i],r->block1[i],tmp_ordsgn,
+                     tmp_typ[typ_i], (int64 *)(r->wvhdl[i]));
+        typ_i++;
+        break;
+
       case ringorder_c:
         rO_Align(j, j_bits);
@@ -3102 +3161 @@
     return;
   }
-  char *TYP[]={"ro_dp","ro_wp","ro_wp_neg","ro_cp",
+  char *TYP[]={"ro_dp","ro_wp","ro_wp64","ro_wp_neg","ro_cp",
                "ro_syzcomp", "ro_syz", "ro_none"};
   int i,j;
@@ -3139 +3198 @@
           Print(" %d",r->typ[j].data.wp.weights[l-r->typ[j].data.wp.start]);
       }
+      else if (r->typ[j].ord_typ==ro_wp64)
+      {
+        Print(" w64:");
+        int l;
+        for(l=r->typ[j].data.wp64.start;l<=r->typ[j].data.wp64.end;l++)
+          Print(" %l",(long)(((int64*)r->typ[j].data.wp64.weights64)+l-r->typ[j].data.wp64.start));
+      }
     }
     PrintLn();
@@ -3555 +3621 @@
 }
 
-int * rGetWeightVec(ring r)
+int64 * rGetWeightVec(ring r)
 {
   assume(r!=NULL);
   assume(r->OrdSize>0);
-  assume(r->typ[0].ord_typ==ro_wp);
-  return (r->typ[0].data.wp.weights);
-}
-
-void rSetWeightVec(ring r, int *wv)
+  int i=0;
+  while((r->typ[i].ord_typ!=ro_wp64) && (r->typ[i].ord_typ>0)) i++;
+  assume(r->typ[i].ord_typ==ro_wp64);
+  return (int64*)(r->typ[i].data.wp64.weights64);
+}
+
+void rSetWeightVec(ring r, int64 *wv)
 {
   assume(r!=NULL);
   assume(r->OrdSize>0);
-  assume(r->typ[0].ord_typ==ro_wp);
-  memcpy(r->typ[0].data.wp.weights,wv,r->N*sizeof(int));
+  assume(r->typ[0].ord_typ==ro_wp64);
+  memcpy(r->typ[0].data.wp64.weights64,wv,r->N*sizeof(int64));
 }
 
@@ -3960 +4028 @@
   return FALSE;
 }
+
+void rModify_a_to_A(ring r)
+// to be called BEFORE rComplete:
+// changes every Block with a(...) to A(...)
+{
+   int i=0;
+   int j;
+   while(r->order[i]!=0)
+   {
+      if (r->order[i]==ringorder_a)
+      {
+        r->order[i]=ringorder_a64;
+        int *w=r->wvhdl[i];
+        int64 *w64=(int64 *)omAlloc((r->block1[i]-r->block0[i]+1)*sizeof(int64));
+        for(j=r->block1[i]-r->block0[i];j>=0;j--)
+                w64[j]=(int64)w[j];
+        r->wvhdl[i]=(int*)w64;
+        omFreeSize(w,(r->block1[i]-r->block0[i]+1)*sizeof(int));
+      }
+      i++;
+   }
+}

kernel/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.9 2005-05-04 14:13:17 Singular Exp $ */
+/* $Id: ring.h,v 1.10 2005-05-04 15:25:46 Singular Exp $ */
 
 /* includes */
@@ -28 +28 @@
 void   rKill(ring r);
 ring   rCopy(ring r);
+ring rCopy0(ring r, BOOLEAN copy_qideal = TRUE, BOOLEAN copy_ordering = TRUE);
 ring   rOpposite(ring r);
 ring   rEnvelope(ring r);
+
 
 
@@ -272 +274 @@
 // construct Wp, C ring
 ring rModifyRing_Wp(ring r, int* weights);
+void rModify_a_to_A(ring r);
 
 void rKillModifiedRing(ring r);
@@ -283 +286 @@
 void pDebugPrint(poly p);
 
-int * rGetWeightVec(ring r);
-void rSetWeightVec(ring r, int *);
+int64 * rGetWeightVec(ring r);
+void rSetWeightVec(ring r, int64 *wv);
 
 lists rDecompose(const ring r);