Changeset e6d914d in git

Timestamp:

Jan 26, 2012, 5:51:21 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4fbc43cfe0d034a0bc31f3f17f00812926c1c4c1

Parents:

9c4455736757027717bc226ed2b7db2cece818812dbf7e59673f79e50959ef8e51ebc47ff01dcb96

Message:

Merge pull request #44 from mmklee/factory_sqrfree_sw

fix: some issues with leading coeff in squarefree factorization over finite fields

Files:

• Singular/gccversion.sh (deleted)
• Singular/ipshell.cc (modified) (1 diff)
• factory/facFqSquarefree.cc (modified) (2 diffs)
• kernel/gccversion.sh (deleted)
• kernel/syz.h (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (1 diff)
• libpolys/resources/feResource.cc (modified) (5 diffs)
• libpolys/resources/feResource.h (modified) (1 diff)

Singular/ipshell.cc

@@ -4932 +4932 @@
 }
 
-const short MAX_SHORT = SHRT_MAX; // (1 << (sizeof(short)*8)) - 1;
+const short MAX_SHORT = 32767; // (1 << (sizeof(short)*8)) - 1;
 
 ////////////////////

factory/facFqSquarefree.cc

@@ -110 +110 @@
   int l= x.level();
   int k;
-  bool GF= false;
   if (CFFactory::gettype() == GaloisFieldDomain)
     k= getGFDegree();
@@ -174 +173 @@
       j.getItem()= CFFactor (j.getItem().factor()/tmp, j.getItem().exp());
       if (degree (tmp) > 0 && tmp.level() > 0)
-        result.append (CFFactor (M (tmp),
+      {
+        tmp= M (tmp);
+        result.append (CFFactor (tmp/Lc(tmp),
                        j.getItem().exp()*p + i.getItem().exp()));
+      }
     }
   }
   for (CFFListIterator i= tmp2; i.hasItem(); i++)
+  {
     if (degree (i.getItem().factor()) > 0 && i.getItem().factor().level() >= 0)
-      result.append (CFFactor (M (i.getItem().factor()), i.getItem().exp()));
+    {
+      tmp= M (i.getItem().factor());
+      result.append (CFFactor (tmp/Lc(tmp), i.getItem().exp()));
+    }
+  }
   for (CFFListIterator j= tmp1; j.hasItem(); j++)
+  {
     if (degree (j.getItem().factor()) > 0 && j.getItem().factor().level() >= 0)
-      result.append (CFFactor (M (j.getItem().factor()), j.getItem().exp()*p));
+    {
+      tmp= M (j.getItem().factor());
+      result.append (CFFactor (tmp/Lc(tmp), j.getItem().exp()*p));
+    }
+  }
   return result;
 }

kernel/syz.h

@@ -8 +8 @@
 * ABSTRACT: Resolutions
 */
+#include <misc/mylimits.h>
 #include <kernel/structs.h>
 #include <polys/monomials/ring.h>

libpolys/polys/monomials/p_polys.cc

@@ -1498 +1498 @@
     n_Normalize(n,r->cf);
     p_SetCoeff(p, n, r);   // destroys old leading coefficient!
-    p = pIter(p);
+    pIter(p);
   }
   n_Delete(&lcInverse, r->cf);

libpolys/resources/feResource.cc

@@ -14 +14 @@
 
 #include "config.h"
-#include <misc/auxiliary.h>
 
 #include <findexec/omFindExec.h>
@@ -32 +31 @@
 
 #include <reporter/reporter.h>
-#if !defined(ESINGULAR) && !defined(TSINGULAR)
 #include <omalloc/omalloc.h>
-#else
-char* feResource(const char id, int warn = -1);
-char* feResource(const char* key, int warn = -1);
-#endif
+//char* feResource(const char id, int warn = -1);
+//char* feResource(const char* key, int warn = -1);
 
 // define RESOURCE_DEBUG for chattering about resource management
 // #define RESOURCE_DEBUG
 
-#if defined(MAKE_DISTRIBUTION)
-#if defined(ix86_Win) && ! defined(__CYGWIN__)
-#define SINGULAR_DEFAULT_DIR "/Singular/"S_VERSION1
-#else // unix
 #define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
-#endif
-#else // ! defined(MAKE_DISTRIBUTION)
-#define SINGULAR_DEFAULT_DIR S_ROOT_DIR
-#endif // defined(MAKE_DISTRIBUTION)
 
 /*****************************************************************
@@ -110 +98 @@
   {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",             (char *)""},
 
-#ifdef ESINGULAR
   {"emacs",     'E',    feResBinary,"ESINGULAR_EMACS",      "%b/emacs",             (char *)""},
   {"xemacs",    'A',    feResBinary,"ESINGULAR_EMACS",      "%b/xemacs",            (char *)""},
@@ -116 +103 @@
   {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular",   (char *)""},
   {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%r/emacs",             (char *)""},
-#elif defined(TSINGULAR)
   {"SingularXterm",'M', feResBinary,"TSINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
 #ifdef ix86_Win
@@ -123 +109 @@
   {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             (char *)""},
 #endif
-#else
   {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             (char *)""},
-#endif
   {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
 };

libpolys/resources/feResource.h

@@ -2 +2 @@
 #define FERESOURCE_H
 
-#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
-#endif
-
-#include <misc/auxiliary.h>
-#include <misc/mylimits.h>
 
 #define DIR_SEP '/'