Changeset cd6dbb2 in git

Timestamp:

Nov 11, 1999, 5:03:33 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

c2c075e00c1bcfd1980cd1e24e5d2c3990ea8ab4

Parents:

1d00a525ad0cde0db365946cde621499f3a50156

Message:

* hannes: spectrum changes, part 1


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

Location:

Singular

Files:

• LIB/sing.lib (modified) (5 diffs)
• iparith.cc (modified) (3 diffs)
• spectrum.cc (modified) (4 diffs)

Singular/LIB/sing.lib

@@ -1 @@
-// $Id: sing.lib,v 1.17 1999-09-21 17:32:18 Singular Exp $
+// $Id: sing.lib,v 1.18 1999-11-11 16:03:33 Singular Exp $
 //(GMG/BM, last modified 26.06.96)
 ///////////////////////////////////////////////////////////////////////////////
 
-version="$Id: sing.lib,v 1.17 1999-09-21 17:32:18 Singular Exp $";
+version="$Id: sing.lib,v 1.18 1999-11-11 16:03:33 Singular Exp $";
 info="
 LIBRARY:  sing.lib      PROCEDURES FOR SINGULARITIES
@@ -21 +21 @@
  nf_icis(i);            generic combinations of generators; get ICIS in nf
  slocus(i);             ideal of singular locus of ideal i
- spectrum(f,w);         spectrum numbers of w-homogeneous polynomial f
+ qhspectrum(f,w);       spectrum numbers of w-homogeneous polynomial f
  Tjurina(i);            SB of Tjurina module of ideal i (assume i is ICIS)
  tjurina(i);            Tjurina number of ideal i (assume i is ICIS)
@@ -378 +378 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-proc spectrum (poly f, intvec w)
-"USAGE:   spectrum(f,w);  f=poly, w=intvec;
+proc qhspectrum (poly f, intvec w)
+"USAGE:   qhspectrum(f,w);  f=poly, w=intvec;
 ASSUME:  f is a weighted homogeneous isolated singularity w.r.t. the weights
          given by w; w must consist of as many positive integers as there
@@ -389 +389 @@
          No return value if basering has parameters or if f is no isolated
          singularity, displays a warning in this case
-EXAMPLE: example spectrum; shows an example
+EXAMPLE: example qhspectrum; shows an example
 "
 {
@@ -425 +425 @@
    poly f=x3+y5+z2;
    intvec w=10,6,15;
-   spectrum(f,w);
+   qhspectrum(f,w);
    // the spectrum numbers are:
    // 1/30,7/30,11/30,13/30,17/30,19/30,23/30,29/30

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.184 1999-10-22 11:14:10 obachman Exp $ */
+/* $Id: iparith.cc,v 1.185 1999-11-11 16:03:31 Singular Exp $ */
 
 /*
@@ -282 +282 @@
   { "sortvec",     0, SORTVEC_CMD ,       CMD_1},
   #ifdef HAVE_SPECTRUM
-  { "Spectrum",    0, SPECTRUM_CMD ,      CMD_123},
+  { "spectrum",    0, SPECTRUM_CMD ,      CMD_123},
   { "semic",       0, SEMIC_CMD ,         CMD_23},
   #endif
@@ -1852 +1852 @@
   int wmaxl=maxl;
   ideal u_id=(ideal)u->Data();
-  
+
   maxl--;
   if ((maxl==-1) && (iiOp!=MRES_CMD))

Singular/spectrum.cc

@@ -1289 +1289 @@
 {
   semicState  state;
-  BOOLEAN qh=((int)w->Data())==1);
+  BOOLEAN qh=(((int)w->Data())==1);
 
   // -----------------
@@ -1295 +1295 @@
   // -----------------
 
-  lists l1 = (lists)first->Data( );
-  lists l2 = (lists)second->Data( );
+  lists l1 = (lists)u->Data( );
+  lists l2 = (lists)v->Data( );
 
   if( (state=list_is_spectrum( l1 ))!=semicOK )
@@ -1313 +1313 @@
     spectrum s2( l2 );
 
-    result->rtyp = INT_CMD;
+    res->rtyp = INT_CMD;
     if (qh)
-      result->data = (void*)(s1.mult_spectrumh( s2 ));
+      res->data = (void*)(s1.mult_spectrumh( s2 ));
     else
-      result->data = (void*)(s1.mult_spectrum( s2 ));
+      res->data = (void*)(s1.mult_spectrum( s2 ));
   }
 
@@ -1328 +1328 @@
 BOOLEAN    semicProc   ( leftv res,leftv u,leftv v )
 {
-  sleft tmp;
-  memset(&tmp,0,sizeof(tmp);
+  sleftv tmp;
+  memset(&tmp,0,sizeof(tmp));
   tmp.rtyp=INT_CMD;
   /* tmp.data = (void *)0;  -- done by memset */