Changeset 327475 in git

Timestamp:

Jul 15, 1999, 3:37:33 PM (24 years ago)

Author:

Tim Wichmann <wichmann@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

877605d1338b4f0ed83344657f95df0a346fca17

Parents:

457bd7daf379c8a6dd5fa01fc2193ed676a5f9f3

Message:

* Added Support for HAVE_EXPLICIT_CONSTR


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

File:

• Singular/fglmhom.cc (modified) (5 diffs)

Singular/fglmhom.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmhom.cc,v 1.12 1999-03-09 12:28:46 obachman Exp $
+// $Id: fglmhom.cc,v 1.13 1999-07-15 13:37:33 wichmann Exp $
 
 /****************************************
@@ -67 +67 @@
         mon.sm= NULL;
     }
+#ifndef HAVE_EXPLICIT_CONSTR
+    void initialize( poly m, int b, BOOLEAN ind ) 
+    {
+        basis = b;
+        inDest = ind;
+        mon.dm = m;
+        mon.sm = NULL;
+    }
+    void initialize( const homogElem h ) 
+    {
+        basis = h.basis;
+        inDest = h.inDest;
+        mon.dm = h.mon.dm;
+        mon.sm = h.mon.sm;
+    }
+#endif
 };
 
@@ -147 +163 @@
                 ++dat->numberofdestbasismonoms;
             if ( dat->numMonoms == dat->monlistmax ) {
-                dat->monlist= (homogElem * )ReAlloc( dat->monlist, (dat->monlistmax)*sizeof( homogElem ), (dat->monlistmax+dat->monlistblock) * sizeof( homogElem ) );
                 int k;
+#ifdef HAVE_EXPLICIT_CONSTR
+                // Expand array using Singulars ReAlloc function
+                dat->monlist= 
+                    (homogElem * )ReAlloc( dat->monlist, 
+                                           (dat->monlistmax)*sizeof( homogElem ), 
+                                           (dat->monlistmax+dat->monlistblock) * sizeof( homogElem ) );
                 for ( k= dat->monlistmax; k < (dat->monlistmax+dat->monlistblock); k++ )
                     dat->monlist[k].homogElem();
+#else
+                // Expand array by generating new one and copying
+                int newsize = dat->monlistmax  + dat->monlistblock;
+                homogElem * tempelem = new homogElem[ newsize ];
+                // Copy old elements
+                for ( k= dat->monlistmax - 1; k >= 0; k-- ) 
+                    tempelem[k].initialize( dat->monlist[k] );
+                delete [] homogElem;
+                homogElem = tempelem;
+#endif
                 dat->monlistmax+= dat->monlistblock;
             }
+#ifdef HAVE_EXPLICIT_CONSTR
             dat->monlist[dat->numMonoms]= homogElem( mon, basis, inDest );
+#else
+            dat->monlist[dat->numMonoms].initialize( mon, basis, inDest );
+#endif
             dat->numMonoms++;
             if ( inSource && ! inDest ) PROT( "\\" );
@@ -342 +377 @@
         dat.monlistblock= 512;
         dat.monlistmax= dat.monlistblock;
+#ifdef HAVE_EXPLICIT_CONSTR
         dat.monlist= (homogElem *)Alloc( dat.monlistmax*sizeof( homogElem ) );
         int j;
         for ( j= dat.monlistmax - 1; j >= 0; j-- ) dat.monlist[j].homogElem();
+#else
+        dat.monlist = new homogElem[ dat.monlistmax ];
+#endif
         dat.numMonoms= 0;
         dat.basisSize= 0;
@@ -369 +408 @@
         gaussreduce( dat, numGBelems, groebnerBS );
 
+#ifdef HAVE_EXPLICIT_CONSTR
         Free( (ADDRESS)dat.monlist, dat.monlistmax*sizeof( homogElem ) );
+#else
+        delete [] dat.monlist;
+#endif
         PROT( "<\n" );
     }