Changeset a5f15a in git

Timestamp:

Jun 28, 1999, 2:48:18 PM (24 years ago)

Author:

Moritz Wenk <wenk@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

0f5091ea1879ab5dca9d221f9cfc0b248090d973

Parents:

3575b7081043283c4e8e7331704af34980748b7d

Message:

* wenk: added numerical algorithms: vandermonde, laguerre, uressolve, mpresmat
     (mpr_base.cc mpr_base.h mpr_inout.cc mpr_inout.h mpr_numeric.cc
      mpr_numeric.h)


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

Location:

Singular

Files:

• LIB/sing.lib (modified) (1 diff)
• Makefile.in (modified) (5 diffs)
• extra.cc (modified) (3 diffs)
• iparith.cc (modified) (7 diffs)
• mpr_base.cc (added)
• mpr_base.h (added)
• mpr_complex.cc (modified) (2 diffs)
• mpr_complex.h (modified) (3 diffs)
• mpr_global.h (modified) (1 diff)
• mpr_inout.cc (added)
• mpr_inout.h (added)
• mpr_numeric.cc (added)
• mpr_numeric.h (added)
• tok.h (modified) (4 diffs)

Singular/LIB/sing.lib

@@ -1 @@
-// $Id: sing.lib,v 1.13 1998-06-02 10:21:19 Singular Exp $
+
+// $Id: sing.lib,v 1.14 1999-06-28 12:48:18 wenk Exp $
 //system("random",787422842);
 //(GMG/BM, last modified 26.06.96)
 ///////////////////////////////////////////////////////////////////////////////
 
-version="$Id: sing.lib,v 1.13 1998-06-02 10:21:19 Singular Exp $";
+version="$Id: sing.lib,v 1.14 1999-06-28 12:48:18 wenk Exp $";
 info="
 LIBRARY:  sing.lib      PROCEDURES FOR SINGULARITIES

Singular/Makefile.in

@@ -82 +82 @@
     mpsr_Put.cc mpsr_PutPoly.cc mpsr_Tok.cc mpsr_GetPoly.cc \
     mpsr_Get.cc mpsr_GetMisc.cc mpsr_Error.cc \
-    ndbm.cc spSpolyLoop.cc libparse.cc mod_raw.cc \
-    pcv.cc kbuckets.cc kbPolyProcs.cc
+    ndbm.cc spSpolyLoop.cc libparse.cc mod_raw.cc\
+        pcv.cc kbuckets.cc kbPolyProcs.cc \
+    mpr_inout.cc mpr_base.cc mpr_numeric.cc
 
 CSOURCES=gmalloc.c mmalloc.c mmheap.c mmpage.c mmcheck.c  mmisc.c mmtables.c \
@@ -103 +104 @@
         kutil.h mpsr_Put.h spolys0.h sing_dld.h\
         ndbm.h spSpolyLoop.h polys-impl.h polys-comp.h getopt.h libparse.h \
-        pcv.h mod_raw.h kbuckets.h kbPolyProcs.h
+        pcv.h mod_raw.h kbuckets.h kbPolyProcs.h \
+        mpr_global.h mpr_inout.h mpr_base.h mpr_numeric.h       
 
 INCS=febase.inc polys.inc iparith.inc mpsr_Tok.inc spSpolyLoop.inc
@@ -131 +133 @@
      mpsr_Get.o mpsr_GetMisc.o ndbm.o spSpolyLoop.o libparse.o \
      find_exec.o getopt.o fereadl.o  mod_raw.o sdb.o \
-     pcv.o kbuckets.o kbPolyProcs.o
+        pcv.o kbuckets.o kbPolyProcs.o \
+     mpr_inout.o mpr_base.o mpr_numeric.o
 
 ##
@@ -356 +359 @@
      mpsr_Get.og mpsr_GetMisc.og \
      ndbm.og spSpolyLoop.og libparse.og  mod_raw.og \
+     mpr_inout.og mpr_base.og mpr_numeric.og \
      pcv.og kbuckets.og kbPolyProcs.og
 
@@ -432 +436 @@
      mpsr_Get.op mpsr_GetMisc.op \
      ndbm.op spSpolyLoop.op libparse.op  mod_raw.op \
-     pcv.op kbuckets.op kbPolyProcs.op
+     mpr_inout.op mpr_base.op mpr_numeric.op \
+     pcv.op kbuckets.op kbPolyProcs.op 
 
 OBJP2= mmalloc.op mmheap.op mmpage.op mmcheck.op mmbt.op page.op \

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.93 1999-06-15 08:29:23 Singular Exp $ */
+/* $Id: extra.cc,v 1.94 1999-06-28 12:48:07 wenk Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -401 +401 @@
 #include "mpsr.h"
 
+#include "mpr_complex.h"
+
 static BOOLEAN jjEXTENDED_SYSTEM(leftv res, leftv h)
 {
@@ -407 +409 @@
     char *sys_cmd=(char *)(h->Data());
     h=h->next;
+/*==================== setFloatDigits ================================*/
+    if(strcmp(sys_cmd,"setFloatDigits")==0)
+    {
+      if ((h!=NULL) && (h->Typ()==INT_CMD)) 
+        {
+          if ( !(rField_is_R()||rField_is_long_R()||rField_is_long_C()) ) 
+          {
+            setGMPFloatDigits( (unsigned long int)h->Data() );
+            res->rtyp=INT_CMD;
+            res->data=(void*)getGMPFloatDigits();
+          }
+          else
+          {
+            res->rtyp=INT_CMD;
+            res->data=(void*)0;
+          }
+          return FALSE;
+        }
+      else
+        {
+          WerrorS("int expected as second parameter");
+        }
+    }
+    else
 /*==================== pcv ==================================*/
 #ifndef HAVE_DYNAMIC_LOADING

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.152 1999-06-22 11:22:23 pohl Exp $ */
+/* $Id: iparith.cc,v 1.153 1999-06-28 12:48:08 wenk Exp $ */
 
 /*
@@ -49 +49 @@
 #endif
 #include "ipshell.h"
+
+#include "mpr_inout.h"
 
 /*=============== types =====================*/
@@ -194 +196 @@
   { "killattrib",  0, KILLATTR_CMD ,      CMD_12},
   { "koszul",      0, KOSZUL_CMD ,        CMD_23},
+  { "laguerre",    0, LAGSOLVE_CMD,       CMD_2},
   { "lead",        0, LEAD_CMD ,          CMD_1},
   { "leadcoef",    0, LEADCOEF_CMD ,      CMD_1},
@@ -217 +220 @@
   { "modulo",      0, MODULO_CMD ,        CMD_2},
   { "monitor",     0, MONITOR_CMD ,       CMD_12},
+  { "mpresmat",    0, MPRES_CMD,          CMD_2},
   { "mult",        0, MULTIPLICITY_CMD ,  CMD_1},
   #ifdef OLD_RES
@@ -291 +295 @@
   { "unload",      0, UNLOAD_CMD ,        CMD_M},
 #endif
+  { "uressolve",   0, URSOLVE_CMD,        CMD_3},
+  { "vandermonde", 0, VANDER_CMD,         CMD_3},
   { "var",         0, VAR_CMD ,           CMD_1},
   { "varstr",      0, VARSTR_CMD ,        CMD_12},
@@ -2271 +2277 @@
 ,{jjWEDGE,     WEDGE_CMD,      MATRIX_CMD,     MATRIX_CMD, INT_CMD PROFILER}
 ,{jjLOAD_E,    LOAD_CMD,       NONE,           STRING_CMD, STRING_CMD PROFILER}
+,{nuLagSolve,  LAGSOLVE_CMD,   LIST_CMD,       POLY_CMD,   INT_CMD PROFILER}
+,{nuMPResMat,  MPRES_CMD,      MODUL_CMD,      IDEAL_CMD,  INT_CMD PROFILER}
 ,{NULL,        0,              0,              0,          0 PROFILER}
 };
@@ -4282 +4290 @@
 ,{jjSUBST_Id,       SUBST_CMD,  MATRIX_CMD, MATRIX_CMD, POLY_CMD,   POLY_CMD }
 ,{jjCALL3MANY,      SYSTEM_CMD, NONE,       STRING_CMD, DEF_CMD,    DEF_CMD }
+,{nuUResSolve,      URSOLVE_CMD,LIST_CMD,   IDEAL_CMD,  INT_CMD,    INT_CMD }
+,{nuVanderSys,      VANDER_CMD, POLY_CMD,   IDEAL_CMD,  IDEAL_CMD,  INT_CMD }
 ,{NULL,             0,          0,          0,          0,          0 }
 };

Singular/mpr_complex.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_complex.cc,v 1.6 1999-06-26 16:40:42 Singular Exp $ */
+/* $Id: mpr_complex.cc,v 1.7 1999-06-28 12:48:12 wenk Exp $ */
 
 /*
@@ -238 +238 @@
   } else if ( rField_is_R() ) {
     // Add some code here :-)
-    Werror("Wrong field!");
+    Werror("Ground field not implemented!");
   } else {
-    Werror("Wrong field!");
+    Werror("Ground field not implemented!");
   }
 

Singular/mpr_complex.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_complex.h,v 1.4 1999-06-24 07:46:51 wenk Exp $ */
+/* $Id: mpr_complex.h,v 1.5 1999-06-28 12:48:13 wenk Exp $ */
 
 /* 
@@ -117 +117 @@
 
 public:
-  static void setPrecision( const unsigned long int prec ) 
-    { gmp_default_prec_bits= prec; }
-  static void setEqualBits( const unsigned long int prec )
-    { gmp_needequal_bits= prec; }
-
-  static const unsigned long int getPrecision() 
-    { return gmp_default_prec_bits; }
-  static const unsigned long int getEqualBits() 
-    { return gmp_needequal_bits; }
+  static void setPrecision( const unsigned long int prec ) { 
+    gmp_default_prec_bits= prec; 
+  }
+  static void setEqualBits( const unsigned long int prec ) { 
+    gmp_needequal_bits= prec; 
+  }
+
+  static const unsigned long int getPrecision() { 
+    return gmp_default_prec_bits; 
+  }
+  static const unsigned long int getEqualBits() { 
+    return gmp_needequal_bits; 
+  }
 
 private:
@@ -250 +254 @@
 gmp_float sqrt( const gmp_float & );
 gmp_float hypot( const gmp_float &, const gmp_float & );
+//gmp_float pow( const gmp_float &, int & );
 
 // simulated functions using double functions

Singular/mpr_global.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_global.h,v 1.2 1999-06-24 07:46:51 wenk Exp $ */
+/* $Id: mpr_global.h,v 1.3 1999-06-28 12:48:14 wenk Exp $ */
 
 /* 

Singular/tok.h

@@ -7 +7 @@
 * ABSTRACT: token for interpreter, as types; general macros
 */
-/* $Id: tok.h,v 1.23 1999-03-16 15:33:16 Singular Exp $ */
+/* $Id: tok.h,v 1.24 1999-06-28 12:48:17 wenk Exp $ */
 
 #ifndef MYYSTYPE
@@ -75 +75 @@
   IS_RINGVAR,
   KILLATTR_CMD,
+  LAGSOLVE_CMD,
   LINK_CMD,
   LIST_CMD,
@@ -81 +82 @@
   MEMORY_CMD,
   MONITOR_CMD,
+  MPRES_CMD,
   MSTD_CMD,
   NAMEOF_CMD,
@@ -110 +112 @@
   TYPEOF_CMD,
   UNLOAD_CMD,
+  URSOLVE_CMD,
+  VANDER_CMD,
   VARSTR_CMD,
   WRITE_CMD,