Changeset 119df1 in git

Timestamp:

Mar 3, 2014, 4:41:58 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

59817e0d039428e1e6d9217750a5c22464d4b321

Parents:

471cf4683230a13ad9eb63c107ae1ac48ad0cf08

Message:

Moved interpolation into kernel/

Files:

• Singular/Makefile.am (modified) (2 diffs)
• Singular/iparith.cc (modified) (4 diffs)
• Singular/test.cc (modified) (1 diff)
• kernel/Makefile.am (modified) (2 diffs)
• kernel/interpolation.cc (moved) (moved from Singular/interpolation.cc) (1 diff)
• kernel/interpolation.h (moved) (moved from Singular/interpolation.h)
• kernel/test.cc (modified) (1 diff)

Singular/Makefile.am

@@ -69 +69 @@
    gms.cc\
    grammar.cc\
-   interpolation.cc\
    iparith.cc\
    ipassign.cc\
@@ -126 +125 @@
    gms.h \
    grammar.h \
-   interpolation.h \
    idrec.h \
    ipconv.h \

Singular/iparith.cc

@@ -12 +12 @@
 
 #include <omalloc/omalloc.h>
+
+#  include <factory/factory.h>
 
 #include <coeffs/bigintmat.h>
@@ -34 +36 @@
 #include <polys/weight.h>
 #include <polys/ext_fields/transext.h>
+#  include <polys/clapsing.h>
 
 #include <kernel/stairc.h>
@@ -51 +54 @@
 #include <kernel/timer.h>
 
+#include <kernel/interpolation.h>
+#  include <kernel/kstdfac.h>
+#  include <kernel/fglm.h>
 
 #include <Singular/tok.h>
@@ -67 +73 @@
 #include <Singular/linearAlgebra_ip.h>
 
-#  include <factory/factory.h>
-#  include <polys/clapsing.h>
-#  include <kernel/kstdfac.h>
-#  include <kernel/fglm.h>
 #  include <Singular/fglm.h>
-
-#include <Singular/interpolation.h>
 
 #include <Singular/blackbox.h>

Singular/test.cc

@@ -187 +187 @@
 #include <Singular/gms.h>
 #include <Singular/grammar.h>
-#include <Singular/interpolation.h>
 #include <Singular/ipconv.h>
 #include <Singular/ipid.h>

kernel/Makefile.am

@@ -30 +30 @@
     linearAlgebra.cc preimage.cc \
     mod2.h \
-    janet.cc
+    janet.cc interpolation.cc
  
 
@@ -53 +53 @@
         linearAlgebra.h \
         f5c.h f5data.h f5gb.h f5lists.h \
-        janet.h
+        janet.h interpolation.h 
+
 
 libkernel_la_includedir  =${includedir}/singular/kernel

kernel/interpolation.cc

@@ -21 +21 @@
 #include <kernel/ideals.h>
 
-#include <Singular/interpolation.h>
+#include <kernel/interpolation.h>
 
 // parameters to debug

kernel/test.cc

@@ -167 +167 @@
 
 #include <kernel/janet.h>
+#include <kernel/interpolation.h>
 
 // #include <polys/clapconv.h> // due to factory? :(