Changeset 2ae96e in git

Timestamp:

Apr 7, 2009, 3:30:01 PM (15 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

90645890f7b3880939698d798f2e0070f96285bc

Parents:

0ad81f2c92a459da3968f1add8868540fe570fb8

Message:

first exponent vector comparison procedures


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

Location:

kernel

Files:

• f5gb.cc (modified) (5 diffs)
• f5gb.h (modified) (2 diffs)

kernel/f5gb.cc

@@ -64 +64 @@
 }
 
-/**
+/*!
+ * ======================================================================
+ * builds the sum of the entries of the exponent vectors, i.e. the degree
+ * of the corresponding monomial
+ * ======================================================================
+*/
+long sumVector(int* v, int k) {
+    int i;
+    long sum =  0;
+    for(i=1; i<=k; i++) {
+        Print("%d\n",v[i]);
+        Print("%ld\n",sum);
+        sum =   sum + v[i];
+    }
+    return sum;
+}
+
+/*!
 ==========================================================================
-compare monomials, i.e. divisibility tests for criterion 1 and criterion 2
+compares monomials, i.e. divisibility tests for criterion 1 and criterion 2
 ==========================================================================
 */
-bool compareMonomials(int* m1, int** m2, int numberOfRules) {
+bool compareMonomials(int* m1, int** m2, int numberOfRules, int k) {
     int i,j;
-    int k   =   sizeof(m1) / sizeof(int);
+    long sumM1  =   sumVector(m1,k);
+    //int k   =   sizeof(m1) / sizeof(int);
     for(i=0; i<numberOfRules; i++) {
-        for(j=1; j<=k; j++) {
-            if(m1[j]>m2[i][j]) {
-                return true;
-            }
+        if(sumVector(m2[i],k) <= sumM1) {
+            for(j=1; j<=k; j++) {
+                if(m1[j]>m2[i][j]) {
+                    return true;
+                }
+            }   
         }
     }
@@ -850 +870 @@
     number nOne =   nInit(1);
     // tag the first element of index i-1 for criterion 1 
-    LTagList* lTag  =   new LTagList();
     //Print("LTAG BEGINNING: %p\n",lTag);
     
@@ -857 +876 @@
     
     int* ev = new int[r->N +1];
-    int  ev2;
     for(i=0;i<IDELEMS(id);i++) {
         pGetExpV(id->m[i],ev);
         //ev2  =   pGetExp(id->m[i],1);
         pWrite(id->m[i]);
-        Print("%d\n",ev2);
         Print("EXP1: %d\n",ev[1]);
         Print("EXP2: %d\n",ev[2]);
         Print("EXP3: %d\n\n",ev[3]);
+        Print("SUM: %ld\n\n\n",sumVector(ev,r->N));
     }
     delete ev;
@@ -899 +917 @@
     //pWrite(gPrev->getFirst()->getPoly());
 
-    lTag->insert(gPrev->getFirst());
+    LTagList* lTag  =   new LTagList(gPrev->getFirst());
+    //lTag->insert(gPrev->getFirst());
     lTag->setFirstCurrentIdx(gPrev->getFirst());
     // computing the groebner basis of the elements of index < actual index
@@ -1038 +1057 @@
     //gPrev->print();
     //delete lTag;
-    //delete rTag;
-    //delete gPrev;
+    delete rTag;
+    delete gPrev;
     reductionTime   =   0;
     spolsTime       =   0;

kernel/f5gb.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.h,v 1.35 2009-04-05 07:49:18 ederc Exp $ */
+/* $Id: f5gb.h,v 1.36 2009-04-07 13:30:01 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
@@ -20 +20 @@
 */
 void qsortDegree(poly* left, poly* right);
+
+/*!
+ * ======================================================================
+ * builds the sum of the entries of the exponent vectors, i.e. the degree
+ * of the corresponding monomial
+ * ======================================================================
+*/
+long sumVector(int* v, int k);
 
 /**