Changeset 9cb4078 in git for kernel/f5data.h

Timestamp:

Mar 4, 2009, 9:23:05 PM (15 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

fe880793d1fe5f78cc5038ae512e18c6cbaab42c

Parents:

fcef59fcd75c37051211c94b3423f0d319602d9d

Message:

implemented interreduction, still with lots of bugs => commented out


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

File:

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

kernel/f5data.h

@@ +1 @@
+//! \file f5data.cc
 /****************************************
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5data.h,v 1.7 2009-02-19 14:52:34 ederc Exp $ */
+/* $Id: f5data.h,v 1.8 2009-03-04 20:23:05 ederc Exp $ */
 /*
 * ABSTRACT: labeled polynomial interface
@@ -9 +10 @@
 #define F5DATA_HEADER
 #ifdef HAVE_F5
-/*
+/*!
 =========================================================
 =========================================================
@@ -21 +22 @@
 
 
-/*
+/*!
 ============================
 class of labeled polynomials
@@ -33 +34 @@
         Rule*   _rule;
     public:
-                LPoly(poly t, int i, poly p, Rule* r=NULL);
-        void    setPoly(poly p);
-        poly    getPoly();
-        void    setTerm(poly t);
-        poly    getTerm();
-        void    setIndex(int i);
-        int     getIndex();
-        void    setRule(Rule* r);
-        Rule*   getRule();
-        void    set(poly t, int i, poly p, Rule* r);
-        LPoly*  get();
+        inline          LPoly(poly t, int i, poly p, Rule* r=NULL);
+        inline  void    setPoly(poly p);
+        inline  poly    getPoly();
+        inline  void    setTerm(poly t);
+        inline  poly    getTerm();
+        inline  void    setIndex(int i);
+        inline  int     getIndex();
+        inline  void    setRule(Rule* r);
+        inline  Rule*   getRule();
+        inline  void    set(poly t, int i, poly p, Rule* r);
+        inline  LPoly*  get();
 };
 
-/*
+LPoly::LPoly(poly t,int i,poly p, Rule* r) {
+    set(t,i,p,r);
+}
+
+void LPoly::setPoly(poly p)  {
+    //poly _p     =   pInit();
+    //_p          =   pCopy(p);
+    polynomial = p;
+}
+
+void LPoly::setTerm(poly t) {
+    //poly _t     =   pInit();
+    //_t          =   pCopy(t);
+    term = t;
+}
+
+void LPoly::setIndex(int i) {
+    index = i;
+}
+
+void LPoly::setRule(Rule* r) {
+    _rule   =   r;
+}
+
+poly LPoly::getPoly() {
+    return polynomial;
+}
+
+poly LPoly::getTerm() {
+    return term;
+}
+
+int LPoly::getIndex() {
+    return index;
+}
+
+Rule* LPoly::getRule() {
+    return _rule;
+}
+
+void LPoly::set(poly t, int i, poly p, Rule* r) {
+    this->setTerm(t);
+    this->setIndex(i);
+    this->setPoly(p);
+    this->setRule(r);
+}
+
+LPoly* LPoly::get() {
+    return this;
+}
+
+
+/*!
 ===================================
 structure of labeled critical pairs
@@ -60 +113 @@
         Rule*   testedRule;     // already tested by rules up to lastRuleTested
     public:
-                CPair(long degree, poly term1, LPoly* lpoly1, poly term2, LPoly* lpoly2, Rule* r = NULL);
-        long    getDeg();
-        poly    getT1();
-        poly*   getAdT1();
-        LPoly*  getAdLp1();
-        poly    getLp1Poly();
-        poly    getLp1Term();
-        int     getLp1Index();
-        poly    getT2();
-        poly*   getAdT2();
-        LPoly*  getAdLp2();
-        poly    getLp2Poly();
-        poly    getLp2Term();
-        int     getLp2Index();
-        Rule*   getTestedRule();
-        void    setTestedRule(Rule* r);
+        inline          CPair(long degree, poly term1, LPoly* lpoly1, poly term2, LPoly* lpoly2, Rule* r = NULL);
+        inline  long    getDeg();
+        inline  poly    getT1();
+        inline  poly*   getAdT1();
+        inline  LPoly*  getAdLp1();
+        inline  poly    getLp1Poly();
+        inline  poly    getLp1Term();
+        inline  int     getLp1Index();
+        inline  poly    getT2();
+        inline  poly*   getAdT2();
+        inline  LPoly*  getAdLp2();
+        inline  poly    getLp2Poly();
+        inline  poly    getLp2Term();
+        inline  int     getLp2Index();
+        inline  Rule*   getTestedRule();
+        inline  void    setTestedRule(Rule* r);
 };
 
-
-/*
+CPair::CPair(long degree, poly term1, LPoly* lpoly1, poly term2, LPoly* lpoly2, Rule* r) {
+   deg              =   degree;
+   t1               =   term1;
+   lp1              =   lpoly1;
+   t2               =   term2;
+   lp2              =   lpoly2;
+   testedRule       =   r;
+}
+
+long CPair::getDeg() {
+    return deg;
+}
+
+poly CPair::getT1() {
+    return t1;
+}
+
+poly* CPair::getAdT1() {
+    return &t1;
+}
+
+poly* CPair::getAdT2() {
+    return &t2;
+}
+
+poly CPair::getT2() {
+    return t2;
+}
+
+LPoly* CPair::getAdLp1() {
+    return lp1;
+}
+
+LPoly* CPair::getAdLp2() {
+    return lp2;
+}
+
+poly CPair::getLp1Poly() {
+    return lp1->getPoly();
+}
+
+poly CPair::getLp2Poly() {
+    return lp2->getPoly();
+}
+
+poly CPair::getLp1Term() {
+    return lp1->getTerm();
+}
+
+poly CPair::getLp2Term() {
+    return lp2->getTerm();
+}
+
+int CPair::getLp1Index() {
+    return lp1->getIndex();
+}
+
+int CPair::getLp2Index() {
+    return lp2->getIndex();
+}
+
+Rule* CPair::getTestedRule() {
+    return testedRule;
+}
+
+void CPair::setTestedRule(Rule* r) {
+    testedRule      =   r;
+}
+
+
+/*!
 ========================================================
 structure of rules(i.e. already computed / known labels)
@@ -89 +211 @@
         poly    term;       // term of the labeled polynomial the rule comes from
     public:
-                Rule(int i, poly term);
-        int     getIndex();
-        poly    getTerm();
+        inline          Rule(int i, poly term);
+        inline  int     getIndex();
+        inline  poly    getTerm();
 };
+
+Rule::Rule(int i, poly t) {
+    index   =   i;
+    term    =   t;
+}
+
+int Rule::getIndex() {
+    return index;
+}
+
+poly Rule::getTerm() {
+    return term;
+}
 #endif
 #endif