Changeset a82adc in git

Timestamp:

May 20, 2005, 5:33:19 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

9c979f4e2cecdbf0abbfc0a11628633d6c2c7d4d

Parents:

e6a01964d9be4bf183ccc3d4b259d99f1b15e31d

Message:

*hannes: try to optimize intvec


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

Location:

kernel

Files:

• intvec.cc (modified) (5 diffs)
• intvec.h (modified) (4 diffs)

kernel/intvec.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: intvec.cc,v 1.2 2004-05-27 12:05:41 Singular Exp $ */
+/* $Id: intvec.cc,v 1.3 2005-05-20 15:33:18 Singular Exp $ */
 /*
 * ABSTRACT: class intvec: lists/vectors of integers
@@ -16 +16 @@
 /*0 implementation*/
 
-
+// omBin intvec_bin = omGetSpecBin(sizeof(intvec));
+#if 0
 intvec::intvec(intvec* iv)
 {
@@ -27 +28 @@
   }
 }
+#endif
 
 intvec::intvec(int s, int e)
@@ -216 +218 @@
 }
 
+#if 0
 intvec * ivCopy(intvec * o)
 {
@@ -221 +224 @@
   return iv;
 }
+#endif
 
 intvec * ivAdd(intvec * a, intvec * b)

kernel/intvec.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: intvec.h,v 1.4 2005-05-04 14:08:54 Singular Exp $ */
+/* $Id: intvec.h,v 1.5 2005-05-20 15:33:19 Singular Exp $ */
 /*
 * ABSTRACT: class intvec: lists/vectors of integers
@@ -11 +11 @@
 #include "omalloc.h"
 #include "febase.h"
+
+
+//extern omBin intvec_bin;
 
 class intvec
@@ -28 +31 @@
   intvec(int s, int e);
   intvec(int r, int c, int init);
-  intvec(intvec* iv);
+  intvec(intvec* iv)
+  {
+    row = iv->rows();
+    col = iv->cols();
+    v   = (int *)omAlloc(sizeof(int)*row*col);
+    for (int i=row*col-1;i>=0; i--)
+    {
+      v[i] = (*iv)[i];
+    }
+  }
 
   void resize(int new_length);
@@ -80 +92 @@
     return m;
   }
+#if 0
+  void* operator new ( size_t size )
+  {
+    void* addr;
+    //omTypeAlloc(void*, addr, size);
+    addr=omAlloc0Bin(intvec_bin);
+    return addr;
+  }
+  void operator delete ( void* block )
+  { //omfree( block ); 
+    omFreeBin((ADDRESS)block, intvec_bin);
+  }
+#endif
   // keiner (ausser obachman) darf das folgenden benutzen !!!
   inline int * ivGetVec() { return v; }
 };
-intvec * ivCopy(intvec * o);
+inline intvec * ivCopy(intvec * o)
+{
+  intvec * iv=new intvec(o);
+  return iv;
+}
+
 intvec * ivAdd(intvec * a, intvec * b);
 intvec * ivSub(intvec * a, intvec * b);