Changeset 642e65 in git

Timestamp:

Jul 7, 2009, 8:54:56 PM (14 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

ab3db62fd566bf974e5dcf6da2405b18b464b0c4

Parents:

e9f5b23f3e4572bcb33e40a8f5debc2ca9bd11a6

Message:

implementation of classes Label and CPair in F5cData.*


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

Location:

kernel

Files:

• F5cData.cc (modified) (2 diffs)
• F5cData.h (modified) (1 diff)

kernel/F5cData.cc

@@ +1 @@
+/*!
+ * \file F5cData.cc
+ * \author Christian Eder
+ * \brief This file includes the inlined methods of the classes CPair and Rule.
+ * \details This file include the inlined methods of the class CPair,
+ * representing critical pairs in the F5C Algorithm, and the class Rule,
+ * representing the labels in the F5C Algorithm. In this file the handling of
+ * these data types is defined.
+ */
+
 #include "mod2.h"
 
@@ -18 +28 @@
 #include "F5cData.h"
 #include "F5cLists.h"
+
 /*
-=====================
-everything is inlined 
-=====================
-*/
+ * CONSTRUCTOR / DESTRUCTOR of class Label
+ */
+
+Label::Label(int* expVec) 
+{
+  m_pExpVec       = expVec;
+  m_nShortExpVec  = computeShortExpVec(m_pExpVec);
+}
+
+Label::~Label() 
+{
+  delete &m_nShortExpVec;
+  delete [] m_pExpVec;
+}
+
+/*
+ * GETTER of class Label
+ */
+inline int* Label::getExpVec() 
+{
+  return m_pExpVec;
+}
+
+inline unsigned long Label::getShortExpVec() 
+{
+  return m_nShortExpVec;
+}
+
+/*
+ * SETTER of class Label
+ */
+
+
+/*
+ * MISC of class Label
+ */
+inline unsigned long Label::computeShortExpVec(int* expVec) 
+{
+  //if (p == NULL) return 0;
+  unsigned long ev = 0; // short exponent vector
+  unsigned int n = BIT_SIZEOF_LONG / currRing->N; // number of bits per exp
+  unsigned int m1; // highest bit which is filled with (n+1)
+  unsigned int i = 0, j=1;
+
+  if (n == 0)
+  {
+    if (currRing->N <2*BIT_SIZEOF_LONG)
+    {
+      n=1;
+      m1=0;
+    }
+    else
+    {
+      for (; j<=(unsigned long) currRing->N; j++)
+      {
+        if (expVec[j] > 0) i++;
+        if (i == BIT_SIZEOF_LONG) break;
+      }
+      if (i>0)
+      ev = ~((unsigned long)0) >> ((unsigned long) (BIT_SIZEOF_LONG - i));
+      return ev;
+    }
+  }
+  else
+  {
+    m1 = (n+1)*(BIT_SIZEOF_LONG - n*currRing->N);
+  }
+
+  n++;
+  while (i<m1)
+  {
+    ev |= getBitFields(expVec[j], i, n);
+    i += n;
+    j++;
+  }
+
+  n--;
+  while (i<BIT_SIZEOF_LONG)
+  {
+    ev |= getBitFields(expVec[j], i, n);
+    i += n;
+    j++;
+  }
+  return ev;
+}
+
+inline unsigned long Label::getBitFields(int e, unsigned int s, unsigned int n)
+{
+#define Sy_bit_L(x)     (((unsigned long)1L)<<(x))
+  unsigned int i = 0;
+  unsigned long  ev = 0L;
+  assume(n > 0 && s < BIT_SIZEOF_LONG);
+  do
+  {
+    assume(s+i < BIT_SIZEOF_LONG);
+    if (e > (int) i) ev |= Sy_bit_L(s+i);
+    else break;
+    i++;
+  }
+  while (i < n);
+  return ev;
+}
+
+
+
 #endif
-// HAVE_F5c
+// HAVE_F5C

kernel/F5cData.h

@@ +1 @@
+/*!
+ * \file F5cData.h
+ * \author Christian Eder
+ * \date 07/07/2009
+ * \version 0.01
+ * \brief Declarations of the classes CPair and Rule.
+ * \details This file contains the declarations of the class \c CPair, representing
+ * critical pairs, and the class \c Label, representing the labels, in the F5C
+ * Algorithm. All methods are inlined.
+ */
+
 #ifndef F5CDATA_HEADER
 #define F5CDATA_HEADER
 #ifdef HAVE_F5C
+
+/*!
+ * class definitions of the needed datatypes in the F5C algorithm:
+ * (a) critical pairs
+ * (b) labels
+ */
+class CPair;
+class Label;
+
+
+/*!
+ * \class CPair
+ * \author Christian Eder
+ * \brief This is the data structure of a critical pair in the F5C implementation.
+ * \details
+ */
+class CPair {
+  private:
+  
+  public:
+
+};
+// end CPair
+
+
+/*!
+ * \class Label
+ * \author Christian Eder
+ * \brief This is the data structure of a rule, i.e. a label in the F5C
+ * Algorithm.
+ * \details
+ */
+class Label {
+  private:
+    int*              m_pExpVec;
+    unsigned long     m_nShortExpVec;
+  public:
+    /*!
+     * \fn Label(int* expVec);
+     * \param[in] expVec The exponent vector of some monomial defining a label
+     * \brief Constructor of an object of class \c Label
+     */
+    Label(int* expVec);
+    /*!
+     * \fn ~Label();
+     * \brief Destructor of an object of class \c Label
+     */
+    ~Label();
+    /*!
+     * \fn static inline int getExpVec();
+     * \return The first entry of the \c integer vector at the address \c m_pExpVec
+     * \brief Getter of the \c integer vector at the address \c m_pExpVec
+     */
+    inline int* getExpVec();
+    /*!
+     * \fn static inline long getShortExpVec();
+     * \return The short exponent vector \c m_nShortExpVec of the label
+     * \brief Getter of the \code unsigned long m_nShortExpVec \endcode
+     * 
+     */
+    inline unsigned long getShortExpVec();
+    /*!
+     * \fn static inline unsigned long computeShortExpVec(int* expVec);
+     * \param[in] expVec The exponent vector of some monomial defining a label
+     * \return Short exponent vector of type \code unsigned long \endcode
+     * \brief Computation of the short exponent vector of type \code unsigned 
+     * long \endcode of the exponent vector \c expVec
+     * \note This method is originally in polys-impl.cc, in this version here it
+     * is optimized for the case of working with exponent vectors and not with
+     * polys as input data.
+     */
+    static inline unsigned long computeShortExpVec(int* expVec);
+    /*!
+     * \fn static inline unsigned long getBitFields(int e, unsigned int s,
+     * unsigned int n);
+     * \param[in] e Entry of the exponent vector
+     * \param[in] s Integer smaller than the bitsize of \c long
+     * \param[in] n Integer representing the number of bits per entry of the
+     * exponent vector \c expVec
+     * \return \code unsigned long \endcode the bitfield for the input data
+     * \brief Computation of the bitfield of type \code unsigned long \endcode
+     * for an entry \c e of the given exponent vector \c expVec at an iteration 
+     * step where \c s iterates over all \c integers smaller than the bitsize of 
+     * \c long, and \c n iterates over the number of bits per entry of the 
+     * exponent vector \c expVec
+     * \note This method is originally in polys-impl.cc, in this version here it
+     * is optimized for the case of working with exponent vectors and not with
+     * polys as input data.
+     */
+    static inline unsigned long getBitFields(int e, unsigned int s, unsigned int n);
+};
+// end Label
 
 #endif