Changeset 6db552 in git

Timestamp:

Dec 15, 2010, 3:53:39 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

d08ed84a213b4110fe1dbe0d38276dce7695a481

Parents:

3da413f2c6332c298e7f4115ffffdc526d5e914a

Message:

removed include-wrapppers

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

Location:

factory

Files:

• DegreePattern.cc (modified) (1 diff)
• DegreePattern.h (modified) (1 diff)
• GNUmakefile.in (modified) (1 diff)
• canonicalform.cc (modified) (2 diffs)
• canonicalform.h (modified) (1 diff)
• cf_algorithm.cc (modified) (1 diff)
• cf_gcd.cc (modified) (1 diff)
• cf_gcd_smallp.cc (modified) (1 diff)
• cf_map.cc (modified) (1 diff)
• cf_map.h (modified) (1 diff)
• facFqBivarUtil.cc (modified) (1 diff)
• facHensel.h (modified) (1 diff)
• fac_ezgcd.cc (modified) (1 diff)
• ffreval.cc (modified) (1 diff)
• ftmpl_array.h (deleted)
• ftmpl_factor.h (deleted)
• ftmpl_functions.h (deleted)
• ftmpl_list.h (deleted)
• ftmpl_matrix.h (deleted)
• int_intdiv.cc (modified) (1 diff)
• sm_sparsemod.cc (modified) (1 diff)
• sm_util.cc (modified) (1 diff)
• sm_util.h (modified) (1 diff)

factory/DegreePattern.cc

@@ -17 +17 @@
 #include "DegreePattern.h"
 #include "cf_iter.h"
-#include "ftmpl_functions.h"
+#include "templates/ftmpl_functions.h"
 #include "gfops.h"
 

factory/DegreePattern.h

@@ -21 +21 @@
 #include "canonicalform.h"
 #include "cf_iter.h"
-#include "ftmpl_functions.h"
+#include "templates/ftmpl_functions.h"
 #include "gfops.h"
 

factory/GNUmakefile.in

@@ -261 +261 @@
                 ffops.h \
                 ffreval.h \
-                ftmpl_array.h \
-                ftmpl_factor.h \
-                ftmpl_functions.h \
                 ftmpl_list.h \
                 ftmpl_matrix.h \

factory/canonicalform.cc

@@ -421 +421 @@
 {
     int what = is_imm( value );
+#if 0
     if ( what )
         if ( what == FFMARK )
@@ -430 +431 @@
     else if ( value->inBaseDomain() )
         return value->degree();
+#else
+    switch(what)
+    {
+      case FFMARK: return imm_iszero_p( value ) ? -1 : 0;
+      case INTMARK: return imm_iszero( value ) ? -1 : 0;
+      case GFMARK:  return imm_iszero_gf( value ) ? -1 : 0;
+      case 0: if ( value->inBaseDomain() )
+              return value->degree();
+              break;
+    }
+#endif
 
     Variable x = value->variable();

factory/canonicalform.h

@@ -21 +21 @@
 #include "cf_defs.h"
 #include "variable.h"
-#include "ftmpl_list.h"
-#include "ftmpl_array.h"
-#include "ftmpl_factor.h"
-#include "ftmpl_matrix.h"
+#include "templates/ftmpl_list.h"
+#include "templates/ftmpl_array.h"
+#include "templates/ftmpl_factor.h"
+#include "templates/ftmpl_matrix.h"
 
 /*BEGINPUBLIC*/

factory/cf_algorithm.cc

@@ -29 +29 @@
 #include "variable.h"
 #include "cf_iter.h"
-#include "ftmpl_functions.h"
+#include "templates/ftmpl_functions.h"
 
 void out_cf(const char *s1,const CanonicalForm &f,const char *s2);

factory/cf_gcd.cc

@@ -17 +17 @@
 #include "cf_algorithm.h"
 #include "fac_util.h"
-#include "ftmpl_functions.h"
+#include "templates/ftmpl_functions.h"
 #include "ffreval.h"
 #include "algext.h"

factory/cf_gcd_smallp.cc

@@ -28 +28 @@
 #include "cf_map.h"
 #include "cf_util.h"
-#include "ftmpl_functions.h"
+#include "templates/ftmpl_functions.h"
 #include "cf_random.h"
 #include "ffreval.h"

factory/cf_map.cc

@@ -15 +15 @@
 #include "cf_map.h"
 #include "cf_iter.h"
-#include "ftmpl_functions.h"
+#include "templates/ftmpl_functions.h"
 
 //{{{ MapPair & MapPair::operator = ( const MapPair & p )

factory/cf_map.h

@@ -25 +25 @@
 #include "variable.h"
 #include "canonicalform.h"
-#include "ftmpl_list.h"
+#include "templates/ftmpl_list.h"
 
 /*BEGINPUBLIC*/

factory/facFqBivarUtil.cc

@@ -17 +17 @@
 #include "cf_map.h"
 #include "cf_map_ext.h"
-#include "ftmpl_functions.h"
+#include "templates/ftmpl_functions.h"
 #include "ExtensionInfo.h"
 #include "cf_algorithm.h"

factory/facHensel.h

@@ -26 +26 @@
 #include "canonicalform.h"
 #include "cf_iter.h"
-#include "ftmpl_functions.h"
+#include "templates/ftmpl_functions.h"
 #include "algext.h"
 

factory/fac_ezgcd.cc

@@ -15 +15 @@
 #include "cf_primes.h"
 #include "fac_distrib.h"
-#include "ftmpl_functions.h"
+#include "templates/ftmpl_functions.h"
 
 static void findeval( const CanonicalForm & F, const CanonicalForm & G, CanonicalForm & Fb, CanonicalForm & Gb, CanonicalForm & Db, REvaluation & b, int delta, int degF, int degG );

factory/ffreval.cc

@@ -9 +9 @@
 #include "cf_primes.h"
 #include "fac_distrib.h"
-#include "ftmpl_functions.h"
+#include "templates/ftmpl_functions.h"
 #include "ffreval.h"
 #include "cf_binom.h"

factory/int_intdiv.cc

@@ -17 +17 @@
 #include "cf_gmp.h"
 #include "gmpext.h"
-#include "ftmpl_functions.h"
+#include "templates/ftmpl_functions.h"
 
 //{{{ InternalCF * InternalInteger::dividesame, dividecoeff ( InternalCF * c )

factory/sm_sparsemod.cc

@@ -28 +28 @@
 #include "sm_util.h"
 #include "sm_sparsemod.h"
-#include "ftmpl_array.h"
-#include "ftmpl_functions.h"
+#include "templates/ftmpl_array.h"
+#include "templates/ftmpl_functions.h"
 
 static CanonicalForm

factory/sm_util.cc

@@ -23 +23 @@
 #include "canonicalform.h"
 #include "variable.h"
-#include "ftmpl_array.h"
+#include "templates/ftmpl_array.h"
 
 //{{{ static CanonicalForm fmonome( const CanonicalForm & f  )

factory/sm_util.h

@@ -17 +17 @@
 #include "canonicalform.h"
 #include "cf_reval.h"
-#include "ftmpl_array.h"
+#include "templates/ftmpl_array.h"
 
 typedef Array<REvaluation> REArray;