Changeset 47a4c2 in git for Singular/ipshell.cc

Timestamp:

Aug 3, 2011, 8:20:19 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

2c52441d528d3c9973ac9373c0325fe522bab68e

Parents:

d16ea9b1d0fce4837d7154d0bdcaa13889e507bc

git-author:

Martin Lee <martinlee84@web.de>2011-08-03 20:20:19+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:14:23+01:00

Message:

moved  semicState,spectrumState and spectrumPrintError to ipshell.cc
adapted member functions involving lists from semic and splist in ipshell.cc
moved function declarations from spectrum.h involving leftv to ipshell.h

File:

• Singular/ipshell.cc (modified) (16 diffs)

Singular/ipshell.cc

@@ -2795 +2795 @@
 
 // ----------------------------------------------------------------------------
-//  Initialize a  spectrum  deep from another  spectrum
-// ----------------------------------------------------------------------------
-
-void spectrum::copy_deep( const spectrum &spec )
-{
-    mu = spec.mu;
-    pg = spec.pg;
-    n  = spec.n;
-
-    copy_new( n );
-
-    for( int i=0; i<n; i++ )
-    {
-        s[i] = spec.s[i];
-        w[i] = spec.w[i];
-    }
-}
-
-// ----------------------------------------------------------------------------
 //  Initialize a  spectrum  deep from a  singular  lists
 // ----------------------------------------------------------------------------
 
-void spectrum::copy_deep( lists l )
-{
-    mu = (int)(long)(l->m[0].Data( ));
-    pg = (int)(long)(l->m[1].Data( ));
-    n  = (int)(long)(l->m[2].Data( ));
-
-    copy_new( n );
+void copy_deep( spectrum& spec, lists l )
+{
+    spec.mu = (int)(long)(l->m[0].Data( ));
+    spec.pg = (int)(long)(l->m[1].Data( ));
+    spec.n  = (int)(long)(l->m[2].Data( ));
+
+    spec.copy_new( spec.n );
 
     intvec  *num = (intvec*)l->m[3].Data( );
@@ -2829 +2810 @@
     intvec  *mul = (intvec*)l->m[5].Data( );
 
-    for( int i=0; i<n; i++ )
-    {
-        s[i] = (Rational)((*num)[i])/(Rational)((*den)[i]);
-        w[i] = (*mul)[i];
+    for( int i=0; i<spec.n; i++ )
+    {
+        spec.s[i] = (Rational)((*num)[i])/(Rational)((*den)[i]);
+        spec.w[i] = (*mul)[i];
     }
 }
@@ -2840 +2821 @@
 // ----------------------------------------------------------------------------
 
-spectrum::spectrum( lists l )
-{
-    copy_deep( l );
+spectrum /*former spectrum::spectrum ( lists l )*/
+spectrumFromList( lists l )
+{
+    spectrum result;
+    copy_deep( result, l );
+    return result;
 }
 
@@ -2849 +2833 @@
 // ----------------------------------------------------------------------------
 
-lists   spectrum::thelist( void )
+/* former spectrum::thelist ( void )*/
+lists   getList( spectrum& spec )
 {
     lists   L  = (lists)omAllocBin( slists_bin);
@@ -2855 +2840 @@
     L->Init( 6 );
 
-    intvec            *num  = new intvec( n );
-    intvec            *den  = new intvec( n );
-    intvec            *mult = new intvec( n );
-
-    for( int i=0; i<n; i++ )
-    {
-        (*num) [i] = s[i].get_num_si( );
-        (*den) [i] = s[i].get_den_si( );
-        (*mult)[i] = w[i];
+    intvec            *num  = new intvec( spec.n );
+    intvec            *den  = new intvec( spec.n );
+    intvec            *mult = new intvec( spec.n );
+
+    for( int i=0; i<spec.n; i++ )
+    {
+        (*num) [i] = spec.s[i].get_num_si( );
+        (*den) [i] = spec.s[i].get_den_si( );
+        (*mult)[i] = spec.w[i];
     }
 
@@ -2873 +2858 @@
     L->m[5].rtyp = INTVEC_CMD; //  multiplicities
 
-    L->m[0].data = (void*)mu;
-    L->m[1].data = (void*)pg;
-    L->m[2].data = (void*)n;
+    L->m[0].data = (void*)spec.mu;
+    L->m[1].data = (void*)spec.pg;
+    L->m[2].data = (void*)spec.n;
     L->m[3].data = (void*)num;
     L->m[4].data = (void*)den;
@@ -2886 +2871 @@
 //  print out an error message for a spectrum list
 // ----------------------------------------------------------------------------
+
+typedef enum
+{
+    semicOK,
+    semicMulNegative,
+
+    semicListTooShort,
+    semicListTooLong,
+
+    semicListFirstElementWrongType,
+    semicListSecondElementWrongType,
+    semicListThirdElementWrongType,
+    semicListFourthElementWrongType,
+    semicListFifthElementWrongType,
+    semicListSixthElementWrongType,
+
+    semicListNNegative,
+    semicListWrongNumberOfNumerators,
+    semicListWrongNumberOfDenominators,
+    semicListWrongNumberOfMultiplicities,
+
+    semicListMuNegative,
+    semicListPgNegative,
+    semicListNumNegative,
+    semicListDenNegative,
+    semicListMulNegative,
+
+    semicListNotSymmetric,
+    semicListNotMonotonous,
+
+    semicListMilnorWrong,
+    semicListPGWrong
+
+} semicState;
 
 void    list_error( semicState state )
@@ -2969 +2988 @@
 // ----------------------------------------------------------------------------
 
+enum    spectrumState
+{
+    spectrumOK,
+    spectrumZero,
+    spectrumBadPoly,
+    spectrumNoSingularity,
+    spectrumNotIsolated,
+    spectrumDegenerate,
+    spectrumWrongRing,
+    spectrumNoHC,
+    spectrumUnspecErr
+};
+
 spectrumState   spectrumCompute( poly h,lists *L,int fast )
 {
@@ -3179 +3211 @@
   #endif
 
-  newtonPolygon nph( h );
+  newtonPolygon nph( h, currRing );
 
   #ifdef SPECTRUM_DEBUG
@@ -3258 +3290 @@
 //  result = list of spectrum numbers
 // ----------------------------------------------------------------------------
+
+void spectrumPrintError(spectrumState state)
+{
+  switch( state )
+  {
+    case spectrumZero:
+      WerrorS( "polynomial is zero" );
+      break;
+    case spectrumBadPoly:
+      WerrorS( "polynomial has constant term" );
+      break;
+    case spectrumNoSingularity:
+      WerrorS( "not a singularity" );
+      break;
+    case spectrumNotIsolated:
+      WerrorS( "the singularity is not isolated" );
+      break;
+    case spectrumNoHC:
+      WerrorS( "highest corner cannot be computed" );
+      break;
+    case spectrumDegenerate:
+      WerrorS( "principal part is degenerate" );
+      break;
+    case spectrumOK:
+      break;
+
+    default:
+      WerrorS( "unknown error occurred" );
+      break;
+  }
+}
 
 BOOLEAN spectrumProc( leftv result,leftv first )
@@ -3577 +3640 @@
     else
     {
-        spectrum s1( l1 );
-        spectrum s2( l2 );
+        spectrum s1= spectrumFromList ( l1 );
+        spectrum s2= spectrumFromList ( l2 );
         spectrum sum( s1+s2 );
 
         result->rtyp = LIST_CMD;
-        result->data = (char*)(sum.thelist( ));
+        result->data = (char*)(getList(sum));
     }
 
@@ -3619 +3682 @@
     else
     {
-        spectrum s( l );
+        spectrum s= spectrumFromList( l );
         spectrum product( k*s );
 
         result->rtyp = LIST_CMD;
-        result->data = (char*)product.thelist( );
+        result->data = (char*)getList(product);
     }
 
@@ -3661 +3724 @@
   else
   {
-    spectrum s1( l1 );
-    spectrum s2( l2 );
+    spectrum s1= spectrumFromList( l1 );
+    spectrum s2= spectrumFromList( l2 );
 
     res->rtyp = INT_CMD;
@@ -3691 +3754 @@
 // ----------------------------------------------------------------------------
 
-spectrumState   spectrumPolyList::spectrum( lists *L,int fast )
-{
-    spectrumPolyNode  **node = &root;
+/* former spectrumPolyList::spectrum ( lists*, int) */
+spectrumState   spectrumStateFromList( spectrumPolyList& speclist, lists *L,int fast )
+{
+    spectrumPolyNode  **node = &speclist.root;
     spectrumPolyNode  *search;
 
@@ -3818 +3882 @@
                 search = search->next;
             }
-            delete_node( node );
+            speclist.delete_node( node );
         }
 
@@ -3844 +3908 @@
     int multiplicity  = 1;
 
-    for( search=root; search!=(spectrumPolyNode*)NULL &&
+    for( search=speclist.root; search!=(spectrumPolyNode*)NULL &&
                      ( fast==0 || search->weight<=smax );
                      search=search->next )