Changeset 022ef5 in git for kernel/structs.h

Timestamp:

Jun 26, 2008, 8:35:45 PM (16 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

a883a37dae9ce90a24c978095e70ce11d4466058

Parents:

953d428419b859c3c241b5c1708342cb31c96e5d

Message:

*motsak: bugfixes + redesign


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

File:

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

kernel/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.46 2008-06-10 15:43:08 Singular Exp $ */
+/* $Id: structs.h,v 1.47 2008-06-26 18:35:45 motsak Exp $ */
 /*
 * ABSTRACT
@@ -468 +468 @@
   nc_type type;
   ring basering; // the ring C,D,.. live in
+
+  // initial data:
   matrix C;
   matrix D;
+
+  // computed data:
   matrix *MT; // size 0.. (rVar()*rVar()-1)/2
   matrix COM;
@@ -479 +483 @@
 
   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; // = 0 by default
-    
-    // for factors of super-commutative algebras we need 
-    // the part of general quotient ideal modulo squares!    
-    ideal idSCAQuotient; // = NULL by default.
+    // 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;
 
   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 ); };
-
-    inline ideal& SCAQuotient() { return (idSCAQuotient); };
+    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); };
 
   public: