Changeset 4fbc43 in git

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5e17976a905ed4b96978d782901ce629d68cadb7

Parents:

e6d914d46115be7cd5ff3fbf2059f167d89779eca88d77fb7c121ed4c21583c156ff79873682c839

Message:

Merge pull request #45 from mmklee/sw_testres

chg: update test results for sqrfree

Files:

• Singular/gccversion.sh (deleted)
• Singular/ipshell.cc (modified) (1 diff)
• Tst/Manual/sqrfree.res.gz.uu (modified) (1 diff)
• Tst/Manual/sqrfree.stat (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;
 
 ////////////////////

Tst/Manual/sqrfree.res.gz.uu

@@ -1 @@
-begin 640 sqrfree.res.gz
-M'XL(".B)<TX``W-Q<F9R964N<F5S`$7.L0K",!`&X+U/<12'I$D*;74*S2`N
-M!7&IFVA1;"50:DTB)GEZ&REUN3NX[[B_/NZJ`P!D`O;5%F*C3=K+6\QAFAHY
-M2(,PCT('(4"_5*?:-AW:3ZK-U43U?)Z+J2@Y/$"5!466.NHQO8]\$440X[-W
-MT)7(,H<O18(L\3A!CGG\A^L`YT>HFQ;-*3N7S#IB/7.>^'RA&_%+&9*\-<HP
-+7T5?K5.<AM``````
+begin 644 sqrfree.res.gz
+M'XL("(7D#D\``W-Q<F9R964N<F5S`$5/30N",!B^[U>\1(=-IS!7E\0=HHL0
+M7>P6)D4:@ICIHFV_ODW%+N_[\'R\']GYD)X`@`DXIGM8R4&&37U?Q6!14;>U
+MQ"1&KH,0,+S[JB_+L"V_X2!O$F5S/!*V]'7[A#[A%"NJJ2'TT<6+@SM']VHT
+M5`E6@297[F'E&^)A'1CR-VZ<<5Z$*RM<6+Y#EBLL2-B$HCP)E/:5";3Q3321
+@W)&^1E8=`XPRRI>Y6S&^Y,[^#)B1>(U^G7@N"OT`````
 `
 end

Tst/Manual/sqrfree.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:298868
-1 >> tst_memory_1 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:794624
-1 >> tst_memory_2 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:825124
-1 >> tst_timer_1 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:6
+1 >> tst_memory_0 :: 1326376069:3140- 13843 :3-1-4:ix86-Linux:mamawutz:299004
+1 >> tst_memory_1 :: 1326376069:3140- 13843 :3-1-4:ix86-Linux:mamawutz:2367488
+1 >> tst_memory_2 :: 1326376069:3140- 13843 :3-1-4:ix86-Linux:mamawutz:2398036
+1 >> tst_timer_1 :: 1326376069:3140- 13843 :3-1-4:ix86-Linux:mamawutz:9

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 '/'