Changeset da408f in git for Singular/mpr_inout.cc

Timestamp:

Jul 8, 1999, 12:18:13 PM (24 years ago)

Author:

Moritz Wenk <wenk@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

b719a30005f8bcbcca9d638b7908dda038ffee56

Parents:

4deddb979be065737d63e926fc05f264a6b1078a

Message:

*wenk: changed uressolve CMD_3 -> CMD_M (4)
	       laguerre  CMD2_ -> CMD_3
       removed "setFloatDigits" in extra.cc
       fixed output (2.2e33 -> 2.2e+33)
       adapted solve.lib to uressolve, laguerre, extended examples


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

File:

• Singular/mpr_inout.cc (modified) (6 diffs)

Singular/mpr_inout.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpr_inout.cc,v 1.3 1999-06-29 09:03:45 wenk Exp $ */
+/* $Id: mpr_inout.cc,v 1.4 1999-07-08 10:18:12 wenk Exp $ */
 
 /*
@@ -166 +166 @@
 //<-
 
-//-> BOOLEAN nuUResSolve( leftv res, leftv arg1, leftv arg2, leftv arg3 )
-BOOLEAN nuUResSolve( leftv res, leftv arg1, leftv arg2, leftv arg3 )
-{
+//-> BOOLEAN nuUResSolve( leftv res, leftv args )
+BOOLEAN nuUResSolve( leftv res, leftv args )
+{
+  leftv v= args;
+
   ideal gls;
-  gls= (ideal)(arg1->Data());
-  int imtype= (int)arg2->Data();
-  int howclean= (int)arg3->Data();
+  int imtype;
+  int howclean;
+
+  // get ideal
+  if ( v->Typ() != IDEAL_CMD )
+    return TRUE;
+  else gls= (ideal)(args->Data());
+  v= v->next;
+
+  // get resultant matrix type to use (0,1)
+  if ( v->Typ() != INT_CMD )
+    return TRUE;
+  else imtype= (int)v->Data();
+  v= v->next;
+
+  // get and set precision in digits ( > 0 )
+  if ( v->Typ() != INT_CMD )
+    return TRUE;
+  else if ( !(rField_is_R()||rField_is_long_R()||rField_is_long_C()) ) 
+  {
+    setGMPFloatDigits( (unsigned long int)v->Data() );
+  }
+  v= v->next;
+
+  // get interpolation steps (0,1,2)
+  if ( v->Typ() != INT_CMD )
+    return TRUE;
+  else howclean= (int)v->Data();
 
   uResultant::resMatType mtype= determineMType( imtype );
@@ -181 +208 @@
   BOOLEAN interpolate_det= (mtype==uResultant::denseResMat)?TRUE:FALSE;
 
-  emptylist= (lists)Alloc( sizeof(slists) );
-  emptylist->Init( 0 );
-
-  res->rtyp = LIST_CMD;
-  res->data= (void *)emptylist;
+  //emptylist= (lists)Alloc( sizeof(slists) );
+  //emptylist->Init( 0 );
+
+  //res->rtyp = LIST_CMD;
+  //res->data= (void *)emptylist;
 
   TIMING_START(mpr_overall);
 
   // check input ideal ( = polynomial system )
-  if ( mprIdealCheck( gls, arg1->Name(), mtype ) != mprOk )
+  if ( mprIdealCheck( gls, args->Name(), mtype ) != mprOk )
   {
     return TRUE;
@@ -265 +292 @@
   else
   {
-    WerrorS("Solver was unable to find any root!");
+    WerrorS("Solver was unable to find any roots!");
     return TRUE;
   }
@@ -283 +310 @@
   res->data= (void *)listofroots;
 
-  emptylist->Clean();
-  //Free( (ADDRESS) emptylist, sizeof(slists) );
+  //emptylist->Clean();
+  //  Free( (ADDRESS) emptylist, sizeof(slists) );
 
   TIMING_EPR(mpr_overall,"overall time\t\t")
@@ -318 +345 @@
 //<-
 
-//-> BOOLEAN nuLagSolve( leftv res, leftv arg1, leftv arg2 )
-BOOLEAN nuLagSolve( leftv res, leftv arg1, leftv arg2 )
+//-> BOOLEAN nuLagSolve( leftv res, leftv arg1, leftv arg2, leftv arg3 )
+BOOLEAN nuLagSolve( leftv res, leftv arg1, leftv arg2, leftv arg3 )
 {
 
   poly gls;
   gls= (poly)(arg1->Data());
-  int howclean= (int)arg2->Data();
+  int howclean= (int)arg3->Data();
+
+  if ( !(rField_is_R()||rField_is_long_R()||rField_is_long_C()) ) 
+  {
+    setGMPFloatDigits( (unsigned long int)arg2->Data() );
+  }
 
   int deg= pTotaldegree( gls );