Changeset 4094445 in git for kernel

Timestamp:

Mar 28, 2014, 4:35:48 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

921690ebf8f0d44823a8ac66bed9ad966eda11ec

Parents:

4fccbc56dabb217a3412ff62cddfe3dc88be1da623a78e8b3bf0711bab934f457ec78ae86fbd64d7

Message:

Merge pull request #551 from adipopescu/LinearAlg

Separation of LinearAlgebra-related code inside Kernel

Location:

kernel

Files:

• Makefile.am (modified) (4 diffs)
• ideals.cc (modified) (1 diff)
• linear_algebra/Makefile.am (added)
• linear_algebra/Minor.cc (moved) (moved from kernel/Minor.cc) (1 diff)
• linear_algebra/Minor.h (moved) (moved from kernel/Minor.h)
• linear_algebra/MinorInterface.cc (moved) (moved from kernel/MinorInterface.cc) (1 diff)
• linear_algebra/MinorInterface.h (moved) (moved from kernel/MinorInterface.h)
• linear_algebra/MinorProcessor.cc (moved) (moved from kernel/MinorProcessor.cc) (1 diff)
• linear_algebra/MinorProcessor.h (moved) (moved from kernel/MinorProcessor.h) (1 diff)
• linear_algebra/eigenval.cc (moved) (moved from kernel/eigenval.cc) (1 diff)
• linear_algebra/eigenval.h (moved) (moved from kernel/eigenval.h)
• linear_algebra/linearAlgebra.cc (moved) (moved from kernel/linearAlgebra.cc) (2 diffs)
• linear_algebra/linearAlgebra.h (moved) (moved from kernel/linearAlgebra.h)
• numeric/mpr_inout.cc (modified) (1 diff)
• numeric/mpr_numeric.cc (modified) (1 diff)
• test.cc (modified) (4 diffs)

kernel/Makefile.am

@@ -2 +2 @@
 # TODO: use ${top_srcdir} instead of .. in the above?
 
-SUBDIRS=sample numeric fglm groebner_walk combinatorics spectrum
+SUBDIRS=sample numeric fglm groebner_walk combinatorics spectrum linear_algebra
 # kernelsample   
 
@@ -22 +22 @@
     syz.cc syz0.cc syz1.cc syz2.cc syz3.cc \
     timer.cc \
-    eigenval.cc units.cc \
+    units.cc \
     fast_mult.cc digitech.cc \
     tgb.cc tgbgauss.cc ringgb.cc f5data.cc f5lists.cc f5gb.cc f5c.cc \
     ratgring.cc shiftgb.cc \
-    linearAlgebra.cc preimage.cc \
+    preimage.cc \
     mod2.h \
-    janet.cc interpolation.cc minpoly.cc \
-    Minor.cc MinorInterface.cc MinorProcessor.cc
+    janet.cc interpolation.cc minpoly.cc
  
-
 libkernel_la_SOURCES   = $(SOURCES)
 
@@ -42 +40 @@
         kutil.h \
         khstd.h kstd1.h \
-        eigenval.h units.h \
+        units.h \
         ratgring.h shiftgb.h nc.h \
         preimage.h timer.h kInline.h fast_mult.h \
         digitech.h tgb.h ringgb.h tgbgauss.h tgb_internal.h \
-        linearAlgebra.h \
         f5c.h f5data.h f5gb.h f5lists.h \
         janet.h interpolation.h minpoly.h \
-        Minor.h MinorInterface.h MinorProcessor.h Cache.h CacheImplementation.h
+        Cache.h CacheImplementation.h
 
 libkernel_la_includedir  =${includedir}/singular/kernel
@@ -61 +58 @@
 ${builddir}/combinatorics/libcombinatorics.la \
 ${builddir}/spectrum/libspectrum.la \
+${builddir}/linear_algebra/liblinear_algebra.la \
 ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} \
 ${abs_top_builddir}/libpolys/polys/libpolys.la

kernel/ideals.cc

@@ -2099 +2099 @@
   ring orig_ring=currRing;
   ring syz_ring=rAssure_SyzComp(orig_ring, TRUE); rChangeCurrRing(syz_ring);
-  rSetSyzComp(length, syz_ring);
+  if (TEST_OPT_RETURN_SB)
+    rSetSyzComp(id_RankFreeModule(temp,orig_ring), syz_ring);
+  else
+    rSetSyzComp(length, syz_ring);
   ideal s_temp;
 

kernel/linear_algebra/Minor.cc

@@ -4 +4 @@
 #include <kernel/mod2.h>
 
-#include "Minor.h"
+#include <kernel/linear_algebra/Minor.h>
 
 #include <kernel/structs.h>

kernel/linear_algebra/MinorInterface.cc

@@ -7 +7 @@
 // #include <cstdio>
 
-#include "MinorInterface.h"
-#include "MinorProcessor.h"
+#include <kernel/linear_algebra/MinorInterface.h>
+#include <kernel/linear_algebra/MinorProcessor.h>
 
 #include <polys/simpleideals.h>

kernel/linear_algebra/MinorProcessor.cc

@@ -4 +4 @@
 #include <kernel/mod2.h>
 
-#include "MinorProcessor.h"
+#include <kernel/linear_algebra/MinorProcessor.h>
 
 #include <polys/kbuckets.h>

kernel/linear_algebra/MinorProcessor.h

@@ -2 +2 @@
 #define MINOR_PROCESSOR_H
 
-#include "Cache.h"
+#include <kernel/Cache.h>
 #include "Minor.h"
 

kernel/linear_algebra/eigenval.cc

@@ -23 +23 @@
 #include <polys/matpol.h>
 #include <polys/clapsing.h>
-#include <kernel/eigenval.h>
+#include <kernel/linear_algebra/eigenval.h>
 
 

kernel/linear_algebra/linearAlgebra.cc

@@ -19 +19 @@
 #include "singularconfig.h"
 #endif /* HAVE_CONFIG_H */
-#include "mod2.h"
+#include <kernel/mod2.h>
 
 #include <coeffs/coeffs.h>
@@ -33 +33 @@
 #include <kernel/structs.h>
 #include <kernel/ideals.h>
-#include <kernel/linearAlgebra.h>
+#include <kernel/linear_algebra/linearAlgebra.h>
 
 /**

kernel/numeric/mpr_inout.cc

@@ -56 +56 @@
 #define TIMING_EPR(t,msg) TIMING_END_AND_PRINT(t,msg);TIMING_RESET(t);
 
-extern size_t gmp_output_digits;
 //<-
 

kernel/numeric/mpr_numeric.cc

@@ -43 +43 @@
 //#include "longrat.h"
 
+#include "mpr_base.h"
 #include "mpr_numeric.h"
 
 #include <math.h>
-
-extern size_t gmp_output_digits;
 //<-
 

kernel/test.cc

@@ -93 +93 @@
 #include <kernel/spectrum/splist.h>
 #include <kernel/spectrum/multicnt.h>
-#include <kernel/eigenval.h>
+#include <kernel/linear_algebra/eigenval.h>
 #include <kernel/units.h>
 #include <kernel/ratgring.h>
@@ -103 +103 @@
 // #include "CCRing.h" // Too old!
 #include <kernel/digitech.h>
-#include <kernel/eigenval.h>
+#include <kernel/linear_algebra/eigenval.h>
 #include <kernel/fast_maps.h>
 #include <kernel/fast_mult.h>
@@ -130 +130 @@
 #include <kernel/khstd.h>
 
-#include <kernel/linearAlgebra.h>
+#include <kernel/linear_algebra/linearAlgebra.h>
 
 
@@ -170 +170 @@
 #include <kernel/minpoly.h>
 
-#include <kernel/Minor.h>
-#include <kernel/MinorInterface.h>
-#include <kernel/MinorProcessor.h>
+#include <kernel/linear_algebra/Minor.h>
+#include <kernel/linear_algebra/MinorInterface.h>
+#include <kernel/linear_algebra/MinorProcessor.h>
 #include <kernel/Cache.h>
 #include <kernel/CacheImplementation.h>