Changeset 77bb59 in git

Timestamp:

Aug 12, 2011, 7:28:54 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

d1433769dfd20e9bf7a4179195d41d4095c91fc7

Parents:

d914cf06d3d3be1689cf60fc38f82a7c3dbdf2c6

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-12 19:28:54+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:24:03+01:00

Message:

CHG: minor changes

Files:

• Singular/iparith.cc (modified) (1 diff)
• Singular/ipshell.cc (modified) (7 diffs)
• kernel/gr_kstd2.cc (modified) (1 diff)
• libpolys/misc/mylimits.h (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)
• standalone.test/test.cc (modified) (5 diffs)

Singular/iparith.cc

@@ -81 +81 @@
 
 
-lists rDecompose(const ring r);
-ring rCompose(const lists  L);
+lists rDecompose(const ring r); ring rCompose(const lists  L);
 
 

Singular/ipshell.cc

@@ -6 +6 @@
 * ABSTRACT:
 */
-
-#include <math.h>
+#include <kernel/mod2.h>
+#include <misc/auxiliary.h>
+
 
 #include <misc/options.h>
-#include <misc/auxiliary.h>
+#include <misc/mylimits.h>
+
 #ifdef HAVE_FACTORY
 #define SI_DONT_HAVE_GLOBAL_VARS
@@ -17 +19 @@
 
 #include <Singular/maps_ip.h>
-#include <kernel/mod2.h>
 #include <Singular/tok.h>
 #include <misc/options.h>
@@ -46 +47 @@
 #include <kernel/splist.h>
 #include <kernel/spectrum.h>
-#include <coeffs/gnumpfl.h>
+////// #include <coeffs/gnumpfl.h>
 //#include <kernel/mpr_base.h>
-#include <coeffs/ffields.h>
+////// #include <coeffs/ffields.h>
 #include <polys/clapsing.h>
 #include <kernel/hutil.h>
@@ -55 +56 @@
 #include <polys/ext_fields/algext.h>
 #include <coeffs/mpr_complex.h>
-#include <coeffs/longrat.h>
+////// #include <coeffs/longrat.h>
 #include <numeric/mpr_base.h>
 #include <numeric/mpr_numeric.h>
+
+#include <math.h>
 
 // define this if you want to use the fast_map routine for mapping ideals
@@ -659 +662 @@
     //             rPar(IDRING(r)),
     //             IDRING(r)->minpoly)))
-    if ((nMap=nSetMap(IDRING(r)->cf))==NULL)
-    {
-      if (rEqual(IDRING(r),currRing))
-      {
-        nMap=n_SetMap(currRing->cf, currRing->cf);
-      }
-      else
-      {
+    if ((nMap=n_SetMap(IDRING(r)->cf, currRing->cf))==NULL)
+    {
+////////// WTF?
+//      if (rEqual(IDRING(r),currRing))
+//      {
+//        nMap = n_SetMap(currRing->cf, currRing->cf);
+//      }
+//      else
+//      {
         Werror("can not map from ground field of %s to current ground field",
           theMap->preimage);
         return NULL;
-      }
+//      }
     }
     if (IDELEMS(theMap)<IDRING(r)->N)
@@ -4881 +4885 @@
 }
 
+const short MAX_SHORT = SHRT_MAX; // (1 << (sizeof(short)*8)) - 1;
+
 ////////////////////
 //
@@ -5103 +5109 @@
   {
     int l=rv->listLength();
-#if SIZEOF_SHORT == 2
-#define MAX_SHORT 0x7fff
-#endif
+
     if (l>MAX_SHORT)
     {

kernel/gr_kstd2.cc

@@ -19 +19 @@
 #include <polys/weight.h>
 #include <polys/polys.h>
+#include <polys/monomials/ring.h>
 
 #include <polys/nc/nc.h>

libpolys/misc/mylimits.h

@@ -19 +19 @@
 #else
 #include <limits.h>
-
 #endif
 

libpolys/polys/monomials/ring.cc

@@ -5543 +5543 @@
   assume(C != NULL);
 
-  if( rField_is_Extension(r) )
+  const BOOLEAN ret = nCoeff_is_algExt(C);
+  
+  if( ret )
   {
     const ring R = C->extRing;
     assume( R != NULL );
-    return idIs0(R->minideal);
-  }
-  return TRUE;
+    assume( !idIs0(R->minideal) );
+  }
+  
+  return ret;
 }
 

standalone.test/test.cc

@@ -115 +115 @@
 
 
-BOOLEAN simple(const n_coeffType _type, cfInitCharProc p, void* param = NULLp)
+BOOLEAN simple(const n_coeffType _type, void* param = NULLp)
 {
-  n_coeffType type = nRegister( _type, p);
-  assume( type == _type ); // ?
-  return ( Test(type, param) );
+//  n_coeffType type = nRegister( _type, p);
+//  assume( type == _type ); // ?
+  return ( Test(_type, param) );
 }
 
@@ -132 +132 @@
   PrintS(StringAppendS("\n"));
   // longrat
-  extern BOOLEAN nlInitChar(coeffs, void*); // Q
-  if( simple(n_Q, nlInitChar) )
+  if( simple(n_Q) )
     PrintS("Q: Test Passed!");
   else 
@@ -140 +139 @@
 
   // modulop
-  extern BOOLEAN npInitChar(coeffs, void*); // Zp
-  if( simple(n_Zp, npInitChar, (void*)7) )
+  if( simple(n_Zp, (void*)7) )
     PrintS("Zp: Test Passed!");
   else 
@@ -148 +146 @@
   
   // due to coeffs/ffields.h
-  extern BOOLEAN nfInitChar(coeffs, void*); // GF
   struct 
   {
@@ -160 +157 @@
   param.GFPar_name= (const char*)"Q";
 
-  if( simple(n_GF, nfInitChar, (void*)&param) )
+  if( simple(n_GF, (void*)&param) )
     PrintS("GF: Test Passed!");
   else