Changeset 4f0f42 in git for libpolys/polys/monomials/ring.cc

Timestamp:

Mar 30, 2011, 6:10:59 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

cf5c053a2033583db0824a2b0459625b00d37a26

Parents:

21c6b368221deec3e5484f0c925b9ea662ef2f90

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-03-30 18:10:59+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:04:16+01:00

Message:

FIX: non-commutative interface in nc/*, main header: nc.h

File:

• libpolys/polys/monomials/ring.cc (modified) (1 diff)

libpolys/polys/monomials/ring.cc

@@ -788 +788 @@
 typedef char *             char_ptr;
 omBin char_ptr_bin = omGetSpecBin(sizeof(char_ptr)); // deallocation?
-
-
-#ifdef HAVE_PLURAL
-// NC pProcs:
-typedef poly (*mm_Mult_p_Proc_Ptr)(const poly m, poly p, const ring r);
-typedef poly (*mm_Mult_pp_Proc_Ptr)(const poly m, const poly p, const ring r);
-
-typedef ideal (*GB_Proc_Ptr)(const ideal F, const ideal Q, const intvec *w, const intvec *hilb, kStrategy strat);
-
-typedef poly (*SPoly_Proc_Ptr)(const poly p1, const poly p2, const ring r);
-typedef poly (*SPolyReduce_Proc_Ptr)(const poly p1, poly p2, const ring r);
-
-typedef void (*bucket_Proc_Ptr)(kBucket_pt b, poly p, number *c);
-
-struct nc_pProcs
-{
-public:
-  mm_Mult_p_Proc_Ptr                    mm_Mult_p;
-  mm_Mult_pp_Proc_Ptr                   mm_Mult_pp;
-
-  bucket_Proc_Ptr                       BucketPolyRed;
-  bucket_Proc_Ptr                       BucketPolyRed_Z;
-
-  SPoly_Proc_Ptr                        SPoly;
-  SPolyReduce_Proc_Ptr                  ReduceSPoly;
-
-  GB_Proc_Ptr                           GB;
-//                                         GlobalGB, // BBA
-//                                         LocalGB;  // MORA
-};
-
-
-struct nc_struct
-{
-  nc_type type;
-  //ring basering; // the ring C,D,.. live in (commutative ring with this NC structure!)
-
-  // initial data: square matrices rVar() x rVar()
-  // logically: upper triangular!!!
-  // TODO: eliminate this waste of memory!!!!
-  matrix C; 
-  matrix D;
-
-  // computed data:
-  matrix *MT; // size 0.. (rVar()*rVar()-1)/2
-  matrix COM;
-  int *MTsize; // size 0.. (rVar()*rVar()-1)/2
-
-  // IsSkewConstant indicates whethere coeffs C_ij are all equal, 
-  // effective together with nc_type=nc_skew
-  int IsSkewConstant;
-
-  private:
-    // internal data for different implementations
-    // if dynamic => must be deallocated in destructor (nc_rKill!)
-    union
-    {
-      struct
-      {
-        // treat variables from iAltVarsStart till iAltVarsEnd as alternating vars.
-        // these variables should have odd degree, though that will not be checked
-        // iAltVarsStart, iAltVarsEnd are only used together with nc_type=nc_exterior
-        // 1 <= iAltVarsStart <= iAltVarsEnd <= r->N
-        unsigned int iFirstAltVar, iLastAltVar; // = 0 by default
-
-        // for factors of super-commutative algebras we need 
-        // the part of general quotient ideal modulo squares!    
-        ideal idSCAQuotient; // = NULL by default. // must be deleted in Kill!
-      } sca;
-    } data;
-
-    CGlobalMultiplier* m_Multiplier;
-    CFormulaPowerMultiplier* m_PowerMultiplier;
-
-  public:
-    
-    inline nc_type& ncRingType() { return (type); };
-    inline nc_type ncRingType() const { return (type); };
-
-    inline unsigned int& FirstAltVar() 
-        { assume(ncRingType() == nc_exterior); return (data.sca.iFirstAltVar); };
-    inline unsigned int& LastAltVar () 
-        { assume(ncRingType() == nc_exterior); return (data.sca.iLastAltVar ); };
-
-    inline unsigned int FirstAltVar() const 
-        { assume(ncRingType() == nc_exterior); return (data.sca.iFirstAltVar); };
-    inline unsigned int LastAltVar () const 
-        { assume(ncRingType() == nc_exterior); return (data.sca.iLastAltVar ); };
-
-    inline ideal& SCAQuotient() 
-        { assume(ncRingType() == nc_exterior); return (data.sca.idSCAQuotient); };
-
-    inline CGlobalMultiplier* GetGlobalMultiplier() const
-        { assume(ncRingType() != nc_exterior); return (m_Multiplier); };
-
-    inline CGlobalMultiplier*& GetGlobalMultiplier()
-        { assume(ncRingType() != nc_exterior); return (m_Multiplier); };
-
-
-    inline CFormulaPowerMultiplier* GetFormulaPowerMultiplier() const
-        { assume(ncRingType() != nc_exterior); return (m_PowerMultiplier); };
-
-    inline CFormulaPowerMultiplier*& GetFormulaPowerMultiplier()
-        { assume(ncRingType() != nc_exterior); return (m_PowerMultiplier); };
-    
-  public:
-    nc_pProcs p_Procs; // NC procedures.
-
-};
-#endif