Changeset 6aef6f2 in git

Timestamp:

Apr 21, 2005, 3:31:32 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

666c9006c3ce6bb4011259e1c0edec1cd1490e29

Parents:

7668071605e2a9aa0d4be436ad97d172a27d5ca4

Message:

*hannes: fast_maps.* ->kernel


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

Files:

• Singular/Makefile.in (modified) (2 diffs)
• Singular/fast_maps.cc (deleted)
• Singular/fast_maps.h (deleted)
• kernel/Makefile.in (modified) (2 diffs)
• kernel/fast_maps.cc (modified) (4 diffs)
• kernel/fast_maps.h (modified) (1 diff)

Singular/Makefile.in

@@ -112 +112 @@
     gms.cc pcv.cc maps_ip.cc\
     tgb.cc\
-    pShallowCopyDelete.cc fast_maps.cc cntrlc.cc misc.cc
+    pShallowCopyDelete.cc cntrlc.cc misc.cc
 
 # stuff for MP
@@ -162 +162 @@
         cntrlc.h ipprint.h sdb.h \
         ipshell.h tok.h \
-        fast_maps.h \
         silink.h \
         fglm.h sing_dbm.h maps_ip.h \

kernel/Makefile.in

@@ -100 +100 @@
     longalg.cc longrat.cc longrat0.cc \
     maps.cc matpol.cc misc.cc gnumpfl.cc gnumpc.cc \
-    modulop.cc mpr_complex.cc sparsmat.cc \
+    modulop.cc mpr_complex.cc sparsmat.cc fast_maps.cc \
     fglmzero.cc fglmvec.cc fglmgauss.cc fglmhom.cc fglmcomb.cc \
     numbers.cc polys.cc p_polys.cc polys0.cc polys1.cc polys-impl.cc \
@@ -148 +148 @@
         numbers.h stype.h clapconv.h ipconv.h maps.h \
         clapsing.h matpol.h polys.h p_polys.h syz.h \
-        ring.h timer.h dError.h \
+        ring.h timer.h dError.h fast_maps.h \
         febase.h shortfl.h mpr_complex.h mpr_global.h \
         gring.h \

kernel/fast_maps.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 02/01
- *  Version: $Id: fast_maps.cc,v 1.1.1.1 2003-10-06 12:15:51 Singular Exp $
+ *  Version: $Id: fast_maps.cc,v 1.2 2005-04-21 13:31:32 Singular Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -34 +34 @@
                          poly pi_m, ring pi_r)
 {
-  int n = min(pi_r->N, n_max_map_monomials);
+  int n = si_min(pi_r->N, n_max_map_monomials);
   int i, j;
   Exponent_t e_i, e_j;
@@ -280 +280 @@
   int* weights = (int*) omAlloc0(map_r->N*sizeof(int));
   int i;
-  int n = min(map_r->N, IDELEMS(image_id));
+  int n = si_min(map_r->N, IDELEMS(image_id));
 
   for (i=0; i<n; i++)
@@ -412 +412 @@
     Print("\n");
 
+  idTest(res_image_id);
   return res_image_id;
 }

kernel/fast_maps.h

@@ -8 +8 @@
  *           bricken (Michael Brickenstein) 
  *  Created: 01/02
- *  Version: $Id: fast_maps.h,v 1.1.1.1 2003-10-06 12:15:51 Singular Exp $
+ *  Version: $Id: fast_maps.h,v 1.2 2005-04-21 13:31:32 Singular Exp $
  *******************************************************************/