Changeset 5d32fd in git

Timestamp:

Nov 24, 1999, 7:13:23 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

4b72f66b46b8b566048c1a700efc18093f7225f0

Parents:

e514ee03b6532cbf576ae3600314e75f2b3c5a8f

Message:

* hannes: move spectrum-stuff to a library and extra.cc, step I


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

Location:

Singular

Files:

• LIB/spectrum.lib (added)
• extra.cc (modified) (3 diffs)
• iparith.cc (modified) (4 diffs)
• spectrum.cc (modified) (1 diff)
• spectrum.h (modified) (1 diff)
• tok.h (modified) (2 diffs)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.119 1999-11-24 17:09:34 Singular Exp $ */
+/* $Id: extra.cc,v 1.120 1999-11-24 18:13:20 Singular Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -52 +52 @@
 #include "distrib.h"
 #include "prCopy.h"
+#ifdef HAVE_SPECTRUM
+#include "spectrum.h"
+#endif
+
 
 // Define to enable many more system commands
@@ -441 +445 @@
    else
    {
+/*==================== spectrum =============================*/
+   #ifdef HAVE_SPECTRUM
+   if(strcmp(sys_cmd,"spectrum") == 0)
+   {
+     if (h->Typ()!=POLY_CMD)
+     {
+       WerrorS("poly expected");
+       return TRUE;
+     }
+     if (h->next==NULL)
+       return spectrumProc(res,h);
+     if (h->next->Typ()!=INT_CMD)
+     {
+       WerrorS("poly,int expected");
+       return TRUE;
+     }
+     if(((int)h->next->Data())==1)
+       return spectrumfProc(res,h);
+     return spectrumProc(res,h);
+   }
+   else
+   {
+   #endif
 /*================= Extended system call ========================*/
 #ifdef HAVE_EXTENDED_SYSTEM

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.190 1999-11-24 17:09:35 Singular Exp $ */
+/* $Id: iparith.cc,v 1.191 1999-11-24 18:13:21 Singular Exp $ */
 
 /*
@@ -285 +285 @@
   { "sortvec",     0, SORTVEC_CMD ,       CMD_1},
   #ifdef HAVE_SPECTRUM
-  { "spectrum",    0, SPECTRUM_CMD ,      CMD_123},
   { "semic",       0, SEMIC_CMD ,         CMD_23},
   #endif
@@ -2297 +2296 @@
 ,{jjSIMPL_ID,  SIMPLIFY_CMD,   MODUL_CMD,      MODUL_CMD,  INT_CMD PROFILER}
 #ifdef HAVE_SPECTRUM
-,{spectrumProc2,SPECTRUM_CMD,  LIST_CMD,       POLY_CMD,   INT_CMD PROFILER}
 ,{semicProc,   SEMIC_CMD,      INT_CMD,        LIST_CMD,   LIST_CMD PROFILER}
 #endif
@@ -3598 +3596 @@
 ,{jjSort_Id,    SORTVEC_CMD,     INTVEC_CMD,     IDEAL_CMD }
 ,{jjSort_Id,    SORTVEC_CMD,     INTVEC_CMD,     MODUL_CMD }
-#ifdef HAVE_SPECTRUM
-,{spectrumProc, SPECTRUM_CMD,    LIST_CMD,       POLY_CMD }
-#endif
 ,{jjSTD,        STD_CMD,         IDEAL_CMD,      IDEAL_CMD }
 ,{jjSTD,        STD_CMD,         MODUL_CMD,      MODUL_CMD }

Singular/spectrum.cc

@@ -1260 +1260 @@
 }
 
-BOOLEAN    spectrumProc2 ( leftv res,leftv u, leftv v)
-{
-  if (((int)v->Data())==1)
-    return spectrumfProc(res,u);
-  return spectrumProc(res,u);
-}
-
 BOOLEAN    spectrumOp3  ( leftv res, leftv u, leftv v, leftv w )
 {

Singular/spectrum.h

@@ -9 +9 @@
 #define SPECTRUM_H
 
-BOOLEAN    spectrumProc2 ( leftv,leftv, leftv );
 BOOLEAN    spectrumOp3  ( leftv,leftv, leftv, leftv );
 BOOLEAN    spectrumProc ( leftv,leftv );

Singular/tok.h

@@ -7 +7 @@
 * ABSTRACT: tokens, types for interpreter; general macros
 */
-/* $Id: tok.h,v 1.31 1999-11-24 17:09:36 Singular Exp $ */
+/* $Id: tok.h,v 1.32 1999-11-24 18:13:23 Singular Exp $ */
 
 #ifndef MYYSTYPE
@@ -107 +107 @@
   ROWS_CMD,
 #ifdef HAVE_SPECTRUM
-  SPECTRUM_CMD,
   SEMIC_CMD,
 #endif