Changeset 8078c8 in git

Timestamp:

Feb 22, 2008, 12:14:16 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

6f801b4e767f113dae2ed6a6e8b95d7227f2c3db

Parents:

d6e849378be41014886cff67801e4f404ef983ca

Message:

hannes: better alg. for OrdSgn


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

File:

• Singular/ipshell.cc (modified) (9 diffs)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.177 2008-02-06 20:22:41 wienand Exp $ */
+/* $Id: ipshell.cc,v 1.178 2008-02-22 11:14:16 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -4195 +4195 @@
   R->wvhdl=(int**)omAlloc0(n*sizeof(int_ptr));
 
+  int *weights=(int*)omAlloc0((R->N+1)*sizeof(int));
+
   // init order, so that rBlocks works correctly
   for (j=0; j < n-1; j++)
@@ -4218 +4220 @@
        */
       R->order[n] = (*iv)[1];
+      typ=1;
       switch ((*iv)[1])
       {
@@ -4226 +4229 @@
           case ringorder_Wp:
             R->wvhdl[n]=(int*)omAlloc((iv->length()-1)*sizeof(int));
+            R->block0[n] = last+1;
             for (i=2; i<iv->length(); i++)
             {
               R->wvhdl[n][i-2] = (*iv)[i];
+              last++;
+              if (weights[last]==0) weights[last]=(*iv)[i]*typ;
             }
-            R->block0[n] = last+1;
-            last += iv->length()-2;
             R->block1[n] = last;
             break;
@@ -4249 +4253 @@
             if (R->block0[n]>R->block1[n]) return TRUE;
             if (rCheckIV(iv)) return TRUE;
+            for(i=R->block0[n];i<=R->block1[n];i++)
+            {
+              if (weights[i]==0) weights[i]=typ;
+            }
             break;
           case ringorder_S:
@@ -4263 +4271 @@
             {
               R->wvhdl[n][i-2]=(*iv)[i];
-              if ((*iv)[i]<0) typ=-1;
+              last++;
+              if (weights[last]==0) weights[last]=(*iv)[i]*typ;
             }
+            last=R->block0[n]-1;
             break;
           case ringorder_a64:
@@ -4275 +4285 @@
             {
               w[i-2]=(*iv)[i];
-              if ((*iv)[i]<0) typ=-1;
+              last++;
+              if (weights[last]==0) weights[last]=(*iv)[i]*typ;
             }
+            last=R->block0[n]-1;
             break;
           }
@@ -4284 +4296 @@
             if (Mtyp==0) return TRUE;
             if (Mtyp==-1) typ = -1;
+            for(i=R->block0[n];i<=R->block1[n];i++)
+            {
+              if (weights[i]==0) weights[i]=typ;
+            }
 
             R->wvhdl[n] =( int *)omAlloc((iv->length()-1)*sizeof(int));
@@ -4332 +4348 @@
     }
   }
-  R->OrdSgn = typ;
+  // find OrdSgn:
+  R->OrdSgn = 1;
+  for(i=1;i<=R->N;i++)
+  { if (weights[i]<0) { R->OrdSgn=-1;break; }}
+  omFree(weights);
   return FALSE;
 }