Changeset a601d5 in git

Timestamp:

Mar 19, 2013, 3:04:41 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

9614bba86831fbfed42ec2f8c377ccc1ec4d9582d4b25e07575f90d19a7fc324664d102ae84e47ad

Parents:

c1ec9a82fe657765b7afd7c7afeff49a89b4dcc0

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-03-19 15:04:41+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-03-19 15:07:37+01:00

Message:

chg: code simplification in walk

File:

• Singular/walk.cc (modified) (7 diffs)

Singular/walk.cc

@@ -1840 +1840 @@
   r->cf  = currRing->cf;
   r->N   = currRing->N;
-  int nb = rBlocks(currRing) + 1;//31.10.01 (+1)
+  int nb = 4;
 
   /*names*/
@@ -1851 +1851 @@
   }
 
-  intvec* iva = va;  //why?
   /*weights: entries for 3 blocks: NULL Made:???*/
   r->wvhdl = (int **)omAlloc0(nb * sizeof(int_ptr));
   r->wvhdl[0] = (int*) omAlloc(nv*sizeof(int));
   for(i=0; i<nv; i++)
-    r->wvhdl[0][i] = (*iva)[i];
+    r->wvhdl[0][i] = (*va)[i];
 
   /* order: a,lp,C,0 */
@@ -1967 +1966 @@
 
   res->cf = currRing->cf; currRing->cf->ref++;
-            
+
 //   if (currRing->cf->extRing!=NULL)
 //     currRing->cf->extRing->ref++;
-// 
+//
 //   if (rParameter (currRing)!=NULL)
 //   {
 //     res->cf->extRing->qideal->m[0]=p_Copy(currRing->cf->extRing->qideal->m[0],currRing->cf->extRing);
 //     int l=rPar(currRing);
-//     
+//
 //     res->cf->extRing->names=(char **)omAlloc(l*sizeof(char_ptr));
-// 
+//
 //     for(i=l-1;i>=0;i--)
 //       rParameter (res)[i]=omStrDup(rParameter (currRing)[i]);
 //   }
-
-  intvec* iva = va;
 
   /*weights: entries for 3 blocks: NULL Made:???*/
@@ -1988 +1985 @@
   res->wvhdl[0] = (int*) omAlloc(nv*sizeof(int));
   for(i=0; i<nv; i++)
-    res->wvhdl[0][i] = (*iva)[i];
+    res->wvhdl[0][i] = (*va)[i];
 
   /* order: a,lp,C,0 */
@@ -2050 +2047 @@
 
   r->cf = currRing->cf; currRing->cf->ref++;
-  
+
 //   if (currRing->cf->extRing!=NULL)
 //     currRing->cf->extRing->ref++;
-// 
+//
 //   if (rParameter (currRing)!=NULL)
 //   {
@@ -2059 +2056 @@
 //     int l=rPar(currRing);
 //     r->cf->extRing->names=(char **)omAlloc(l*sizeof(char_ptr));
-// 
+//
 //     for(i=l-1;i>=0;i--)
 //       rParameter(r)[i]=omStrDup(rParameter (currRing)[i]);
@@ -2107 +2104 @@
 //     int l=rPar(currRing);
 //     r->cf->extRing->names=(char **)omAlloc(l*sizeof(char_ptr));
-// 
+//
 //     for(i=l-1;i>=0;i--)
 //       rParameter(r)[i]=omStrDup(rParameter(currRing)[i]);