Changeset 5a9e7b in git for kernel/structs.h

Timestamp:

Jan 3, 2007, 1:17:12 AM (17 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3d11074289ae1a5160b095ecdc1e4d8279ffedc5

Parents:

6dbc9674142dc50c311aab80c025def4c3a3bf08

Message:

*motsak: rewritten non-commutative engine + sca support


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

File:

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

kernel/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.25 2006-12-15 17:16:07 Singular Exp $ */
+/* $Id: structs.h,v 1.26 2007-01-03 00:17:12 motsak Exp $ */
 /*
 * ABSTRACT
@@ -64 +64 @@
 typedef long int64;
 #else
-#error int64 undefined 
+#error int64 undefined
 #endif
 
@@ -101 +101 @@
 };
 
-#ifdef HAVE_PLURAL
+// #ifdef HAVE_PLURAL
 enum nc_type
 {
-  nc_general=0, /* yx=q xy+... */
+  nc_error = -1, // Something's gone wrong!
+  nc_general = 0, /* yx=q xy+... */
   nc_skew, /*1*/ /* yx=q xy */
   nc_comm, /*2*/ /* yx= xy */
   nc_lie,  /*3*/ /* yx=xy+... */
-  nc_undef /*4*/  /* for internal reasons */
-};
-#endif
+  nc_undef, /*4*/  /* for internal reasons */
+
+  nc_exterior /*5*/ // Exterior Algebra(SCA): yx= -xy & (!:) x^2 = 0
+};
+// #endif
 
 typedef enum { LT_NONE, LT_NOTFOUND, LT_SINGULAR, LT_ELF, LT_HPUX, LT_MACH_O} lib_types;
@@ -144 +147 @@
 typedef struct  n_Procs_s  n_Procs_s;
 
-#ifdef HAVE_PLURAL
+// #ifdef HAVE_PLURAL
 struct nc_struct;
 typedef struct nc_struct   nc_struct;
-#endif
+// #endif
 
 typedef struct _ssubexpr   sSubexpr;
@@ -410 +413 @@
 };
 
-#ifdef HAVE_PLURAL
+// #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
+{
+  short ref;
+  nc_type type;
+  ring basering; // the ring C,D,.. live in
+  matrix C;
+  matrix D;
+  matrix *MT;
+  matrix COM;
+  int *MTsize;
+
+  // IsSkewConstantindicates whethere coeffs C_ij are all equal, effective together with nc_type=nc_skew
+  int IsSkewConstant;
+
+  private:
+    // 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;
+
+  public:
+    inline unsigned int& FirstAltVar() { return (iFirstAltVar); };
+    inline unsigned int& LastAltVar () { return (iLastAltVar ); };
+
+    inline unsigned int FirstAltVar() const { return (iFirstAltVar); };
+    inline unsigned int LastAltVar () const { return (iLastAltVar ); };
+
+  public:
+    nc_pProcs p_Procs; // NC procedures.
+
+};
+// #endif
+#if 0
 struct nc_struct
 {
@@ -425 +491 @@
 };
 #endif
+
 
 struct sip_sring