Changeset 1db49f in git

Timestamp:

Nov 11, 2010, 4:18:11 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

305203f55e4311b004c2b06907682977f456e3bb

Parents:

ffc1929d7935a3701497da7b790f35e60cb090e1

Message:

syzcomp1dpc etc removed

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

Location:

kernel

Files:

• syz.h (modified) (1 diff)
• syz1.cc (modified) (2 diffs)

kernel/syz.h

@@ -119 +119 @@
 extern long *  currShiftedComponents;
 
-int syzcomp1dpc(poly p1, poly p2);
 void syDeletePair(SObject * so);
 void syInitializePair(SObject * so);

kernel/syz1.cc

@@ -163 +163 @@
 * exp[0]
 */
-static int syzcomp0dpc(poly p1, poly p2)
-{
-  /*4 compare monomials by order then revlex*/
-    int i = pVariables;
-    if ((pGetExp(p1,i) == pGetExp(p2,i)))
-    {
-      do
-      {
-        i--;
-        if (i <= 1)
-        {
-           /*4 handle module case:*/
-           if (pGetComp(p1)==pGetComp(p2)) return 0;
-           else if
-              (currcomponents[pGetComp(p1)]>currcomponents[pGetComp(p2)])
-                return 1;
-           else return -1;
-        }
-      } while ((pGetExp(p1,i) == pGetExp(p2,i)));
-    }
-    if (pGetExp(p1,i) < pGetExp(p2,i)) return 1;
-    return -1;
-}
-
-/*3
-* replaces comp1dpc during homogeneous syzygy-computations
-* compares with components of currcomponents instead of the
-* exp[0]
-*/
-int syzcomp1dpc(poly p1, poly p2)
-{
-  int i = pVariables;
-  while ((i>1) && (pGetExp(p1,i)==pGetExp(p2,i)))
-    i--;
-  if (i>1)
-  {
-    if (pGetExp(p1,i) < pGetExp(p2,i)) return 1;
-    return -1;
-  }
-  int o1=pGetComp(p1);
-  int o2=pGetComp(p2);
-  if (o1==o2/*pGetComp(p1)==pGetComp(p2)*/) return 0;
-  if (currcomponents[o1]>currcomponents[o2]) return 1;
-  return -1;
-
-}
-
-/*3
-* replaces comp1dpc during homogeneous syzygy-computations
-* compares with components of currcomponents instead of the
-* exp[0]
-*/
 
 #ifdef PDEBUG
@@ -276 +224 @@
 }
 #endif // PDEBUG
-
-/*3
-* compares only the monomial without component
-*/
-static int syzcompmonomdp(poly p1, poly p2)
-{
-  int i;
-
-  /*4 compare monomials by order then revlex*/
-  if (pGetOrder(p1) == pGetOrder(p2))
-  {
-    i = pVariables;
-    if ((pGetExp(p1,i) == pGetExp(p2,i)))
-    {
-      do
-      {
-        i--;
-        if (i <= 1)
-          return 0;
-      } while ((pGetExp(p1,i) == pGetExp(p2,i)));
-    }
-    if (pGetExp(p1,i) < pGetExp(p2,i)) return 1;
-    return -1;
-  }
-  else if (pGetOrder(p1) > pGetOrder(p2)) return 1;
-  return -1;
-}
 
 poly syRedtail (poly p, syStrategy syzstr, int index)