Changeset 2180 in Sophya for trunk/SophyaPI

Timestamp:

Aug 13, 2002, 12:43:33 PM (23 years ago)

Author:

cmv

Message:

command eval dans spiapp cmv 13/8/02

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (2 diffs)
• nobjmgr.cc (modified) (7 diffs)
• servnobjm.cc (modified) (5 diffs)
• servnobjm.h (modified) (1 diff)

trunk/SophyaPI/PIext/basexecut.cc

@@ -716 +716 @@
   }
 
+// >>>>>>>>>>>  Calcul d'expression arithmetique
+else if ( (kw == "eval") ) {
+  if(tokens.size()<2)
+    {cout<<"Usage: eval resultvarname arithmetic expression...."<<endl; return(0);}
+  string expval = "";
+  for(unsigned int i=1;i<tokens.size();i++) expval+=tokens[i];
+  string resultvarname = "";
+  if(isalpha(tokens[0][0])) resultvarname=tokens[0];
+  mObjMgr->GetServiceObj()->ExpVal(expval,resultvarname); 
+  }
 
 else  { 
@@ -1230 +1240 @@
 mpiac->RegisterCommand(kw, usage, this, "Expr. Plotting");
 
+
+kw = "eval";
+usage = "Compute arithmetic expression\n";
+usage += "\n Usage: eval resultvarname arithmetic expression....";
+usage += "\n  resultvarname: store result in variable resultvarname";
+usage += "\n    - If first character is not alphabetic, just print result";
+usage += "\n  arithmetic expression:";
+usage += "\n      ex: x + sqrt(y)+z +3.14    (x,y,z are variables)";
+usage += "\n      ex: $x + sqrt($y)+$z +3.14 (x,y,z are variables)";
+usage += "\n      ex: 360 * M_PI / 180.";
+mpiac->RegisterCommand(kw, usage, this, "Expr. Arithmetic");
+
 }
 

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -823 +823 @@
 void NamedObjMgr::ReadObj(PInPersist& s, int num)
 {
-int_4 i, cid, key, ln; // $CHECK$ int -> int_4 a cause de TagKey
+int_4 i; // $CHECK$ int -> int_4 a cause de TagKey
+#ifdef SANS_EVOLPLANCK
+int_4 cid, key, ln; // $CHECK$ int -> int_4 a cause de TagKey
+#endif
 int n0, n1;
 bool ok = true;
@@ -899 +902 @@
 PPersist* obj=NULL;
 
-PInPersist* ppin;
+PInPersist* ppin=NULL;
 #ifdef SANS_EVOLPLANCK
 TRY{
@@ -932 +935 @@
 void NamedObjMgr::ReadFits(string const & flnm, string & nobj)
 {
+
+#ifdef SANS_EVOLPLANCK 
 bool ok = false;
-
-#ifdef SANS_EVOLPLANCK 
 RzImage* obj=NULL;
 TRY{
@@ -1018 +1021 @@
 
 bool ok = true;
-POutPersist* pout;
+POutPersist* pout=NULL;
 #ifdef SANS_EVOLPLANCK 
 TRY{
@@ -1051 +1054 @@
 bool ok = true;
 
-POutPersist* pout;
+POutPersist* pout=NULL;
 #ifdef SANS_EVOLPLANCK 
 TRY{
@@ -1317 +1320 @@
 bool errx=false, erry=false, errz=false;
 if(err.length()>0) {
-  for(int i=0;i<err.length();i++)
+  for(int i=0;i<(int_4)err.length();i++)
     if     (err[i]=='x' || err[i]=='X') errx = true;
     else if(err[i]=='y' || err[i]=='Y') erry = true;
@@ -1416 +1419 @@
 string title = ny + " (Y) vs. " + nx + " (X)";
 // display 2D
-int wrsid = myImgApp->DispScDrawer(vxydrw, title, dopt);
+myImgApp->DispScDrawer(vxydrw, title, dopt);
 
 return;

trunk/SophyaPI/PIext/servnobjm.cc

@@ -313 +313 @@
 
 /* --Methode-- */
+void Services2NObjMgr::ExpVal(string expval,string resultvarname)
+{
+ // Fill C-file to be executed
+ FILE *fip;
+ string func = "eval_pia_dl_func";
+ string fname = TmpDir + func; fname += ".c";
+ string  cmd = "rm -f " + fname; system(cmd.c_str());
+ if((fip=fopen(fname.c_str(), "w"))==NULL) { 
+   cout << "Services2NObjMgr/EvalExp_Error: fopen("<<fname<<")"<<endl; 
+   return; 
+ }
+ fprintf(fip,"#include <math.h>\n");
+ fprintf(fip,"double %s(double ___dummy_variable___) \n{\n",func.c_str());
+ // Add all variables already declared
+ DVList& varlist = mOmg->GetVarList();
+ DVList::ValList::const_iterator it;
+ for(it = varlist.Begin(); it != varlist.End(); it++) {
+#ifdef SANS_EVOLPLANCK
+   MuTyV mtv = (*it).second;
+   double value = (double)(mtv);
+#else
+   double value = (double)((*it).second.elval);
+#endif
+   string name_var = (*it).first;
+   fprintf(fip,"double %s = %.17f;\n",name_var.c_str(),value);
+ }
+ fprintf(fip,"return %s;\n}\n",expval.c_str());
+ fclose(fip);
+
+ // Dynamically link function
+ DlFunctionOfX f = (DlFunctionOfX) LinkFunctionFromFile(fname,func);
+ if(!f) {
+   cout<<"Services2NObjMgr/EvalExp_Error: linking DlFunctionOfX"<<endl;
+   cout<<"...expval = "<<expval<<endl;
+   return;
+ }
+
+ // Evaluate function and close dynamic link
+ double result;
+ try {
+   result = f(0.);
+   CloseDLL();
+ } catch ( ... ) {
+   cout<<"Services2NObjMgr/EvalExp_Error: Arithmetic exception"<<endl;
+   CloseDLL();
+   return;
+ }
+
+ // Eventually store the result into variable or just print it
+ if(resultvarname.size()>0) {
+   if(mOmg->HasVar(resultvarname)) mOmg->DeleteVar(resultvarname);
+   char str[512];
+   if(result==0.) sprintf(str,"%f",result);
+   else {
+     double lr = log10(fabs(result));
+     if(lr>-17. && lr<17.) sprintf(str,"%17f",result);
+     else                   sprintf(str,"%.17e",result);
+   }
+   mOmg->SetVar(resultvarname,(string)str);
+ } else cout<<result<<" = "<<expval<<endl;
+
+}
+
+/* --Methode-- */
 void Services2NObjMgr::DisplayPoints2D(string& nom,  string& expx, string& expy,
                                        string& experrx, string& experry,
@@ -624 +688 @@
   for(k=0; k<nt->NEntry(); k++)    {
     xn = nt->GetLineD(k);
-    i = xn[0]+0.5;
+    i = int(xn[0]+0.5);
     if ( (i < 0) || i >= v1->NElts() ) continue;
     (*v1)(i) = xn[1];
@@ -673 +737 @@
   for(k=0; k<nt->NEntry(); k++)    {
     xn = nt->GetLineD(k);
-    ic = xn[0]+0.5;
-    jl = xn[1]+0.5;
+    ic = int(xn[0]+0.5);
+    jl = int(xn[1]+0.5);
     if ( (ic < 0) || ic >= mtx->NCol() ) continue;
     if ( (jl < 0) || jl >= mtx->NRows() ) continue;
@@ -850 +914 @@
 if (k1 < 0) k1 = 0;
 if (k2 < 0) k2 = objnt->NbLines();
-if (k2 > objnt->NbLines()) k2 = objnt->NbLines();
+if (k2 > (int_4)objnt->NbLines()) k2 = objnt->NbLines();
 if (dk <= 0) dk = 1;
 
@@ -1121 +1185 @@
 if (k1 < 0) k1 = 0;
 if (k2 < 0) k2 = objnt->NbLines();
-if (k2 > objnt->NbLines()) k2 = objnt->NbLines();
+if (k2 > (int_4)objnt->NbLines()) k2 = objnt->NbLines();
 if (dk <= 0) dk = 1;
 

trunk/SophyaPI/PIext/servnobjm.h

@@ -62 +62 @@
   virtual void  PlotFunc2D(DlFunctionOfXY f, string & nom, double xmin, double xmax, 
                            double ymin, double ymax, int npx=50, int npy=50, string dopt="");
+
+// Calcul d'expression arithmetique
+  virtual void ExpVal(string expval,string resultvarname="");
 
 //  Trace d'expression de NTuple, et d'autres objets