Changeset 0179d5 in git for kernel/f5data.h

Timestamp:

Jul 16, 2009, 9:47:51 AM (15 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4feee0a979cff0b1422136e2611e127a8267eb8d

Parents:

d4f44f4f228fbb8258ce8e9927141d37d4470719

Message:

options for switching between F5, F5R and F5C: "0" = F5, "1" = F5R, "2" = F5C, ""(no option set at all) = F5C
this version only produces top reductions


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

File:

• kernel/f5data.h (modified) (6 diffs)

kernel/f5data.h

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5data.h,v 1.12 2009-06-23 10:08:15 ederc Exp $ */
+/* $Id: f5data.h,v 1.13 2009-07-16 07:47:51 ederc Exp $ */
 /*
 * ABSTRACT: labeled polynomial interface
@@ -18 +18 @@
 */
 class LPoly;
-class CPair;
+class CPairOld;
 class Rule;
 
@@ -116 +116 @@
 ===================================
 */
-class CPair {
+class CPairOld {
     private:
         long    deg;            // total degree of the critical pair
@@ -125 +125 @@
         Rule*   testedRule;     // already tested by rules up to lastRuleTested
     public:
-        inline          CPair(long degree, poly term1, LPoly* lpoly1, poly term2, LPoly* lpoly2, Rule* r = NULL);
+        inline          CPairOld(long degree, poly term1, LPoly* lpoly1, poly term2, LPoly* lpoly2, Rule* r = NULL);
         inline  long    getDeg();
         inline  poly    getT1();
@@ -143 +143 @@
 };
 
-CPair::CPair(long degree, poly term1, LPoly* lpoly1, poly term2, LPoly* lpoly2, Rule* r) {
+CPairOld::CPairOld(long degree, poly term1, LPoly* lpoly1, poly term2, LPoly* lpoly2, Rule* r) {
    deg              =   degree;
    t1               =   term1;
@@ -152 +152 @@
 }
 
-long CPair::getDeg() {
+long CPairOld::getDeg() {
     return deg;
 }
 
-poly CPair::getT1() {
+poly CPairOld::getT1() {
     return t1;
 }
 
-poly* CPair::getAdT1() {
+poly* CPairOld::getAdT1() {
     return &t1;
 }
 
-poly* CPair::getAdT2() {
+poly* CPairOld::getAdT2() {
     return &t2;
 }
 
-poly CPair::getT2() {
+poly CPairOld::getT2() {
     return t2;
 }
 
-LPoly* CPair::getAdLp1() {
+LPoly* CPairOld::getAdLp1() {
     return lp1;
 }
 
-LPoly* CPair::getAdLp2() {
+LPoly* CPairOld::getAdLp2() {
     return lp2;
 }
 
-poly CPair::getLp1Poly() {
+poly CPairOld::getLp1Poly() {
     return lp1->getPoly();
 }
 
-poly CPair::getLp2Poly() {
+poly CPairOld::getLp2Poly() {
     return lp2->getPoly();
 }
 
-poly CPair::getLp1Term() {
+poly CPairOld::getLp1Term() {
     return lp1->getTerm();
 }
 
-poly CPair::getLp2Term() {
+poly CPairOld::getLp2Term() {
     return lp2->getTerm();
 }
 
-int CPair::getLp1Index() {
+int CPairOld::getLp1Index() {
     return lp1->getIndex();
 }
 
-int CPair::getLp2Index() {
+int CPairOld::getLp2Index() {
     return lp2->getIndex();
 }
 
-Rule* CPair::getTestedRule() {
+Rule* CPairOld::getTestedRule() {
     return testedRule;
 }
 
-void CPair::setTestedRule(Rule* r) {
+void CPairOld::setTestedRule(Rule* r) {
     testedRule      =   r;
 }