Changeset 2179 in Sophya for trunk

Timestamp:

Aug 13, 2002, 12:38:56 PM (23 years ago)

Author:

cmv

Message:

disparition de varop dans skymapmodule.cc

Location:

trunk/SophyaPI/ProgPI

Files:

• skymapmodule.cc (modified) (8 diffs)
• skymapmodule.pic (modified) (1 diff)
• sopiamodule.cc (modified) (1 diff)

trunk/SophyaPI/ProgPI/skymapmodule.cc

@@ -68 +68 @@
   void ClOper(vector<string>& tokens);
   void ClRebin(vector<string>& tokens);
-  void VarOper(vector<string>& tokens);
 protected:
   void SetTypeMap(vector<string>& tokens);
@@ -256 +255 @@
 mpiac->RegisterCommand(kw, usage, this, hgrp);
 
-kw = "varop";
-usage = "operation on variables";
-usage += "\n Usage: varop var1 op var2 [resultvarname]";
-usage += "\n   Do result = var1 op var2";
-usage += "\n      where op = +,-,*,/,^(pow),exp,sqrt,log,log10";
-usage += "\n   resultvarname = variable name to store the result";
-mpiac->RegisterCommand(kw, usage, this, hgrp);
-
 DefTypMap = HealPix;
 }
@@ -416 +407 @@
   }
   ClRebin(tokens);
-} else if(kw == "varop") {
-  if(tokens.size()<2) {
-    cout<<"Usage: varop var1 op var2 [resultvarname]"<<endl;
-    return(0);
-  }
-  VarOper(tokens);
 }
 
@@ -610 +595 @@
  if(tokens.size()>2) {
    if(omg.HasVar(tokens[2])) omg.DeleteVar(tokens[2]);
-   char str[128]; sprintf(str,"%g",per);
+   char str[512]; sprintf(str,"%g",per);
    omg.SetVar(tokens[2],(string)str);
    cout<<" stored into $"<<tokens[2];
@@ -1160 +1145 @@
  if(tokens.size()>2) if(tokens[2][0]!='!') {
    if(omg.HasVar(tokens[2])) omg.DeleteVar(tokens[2]);
-   char str[128]; sprintf(str,"%.8f",sum);
+   char str[512]; sprintf(str,"%.8f",sum);
    omg.SetVar(tokens[2],(string)str);
    cout<<" mean stored into $"<<tokens[2];
@@ -1166 +1151 @@
  if(tokens.size()>3) if(tokens[3][0]!='!') {
    if(omg.HasVar(tokens[3])) omg.DeleteVar(tokens[3]);
-   char str[128]; sprintf(str,"%.8f",sum2);
+   char str[512]; sprintf(str,"%.8f",sum2);
    omg.SetVar(tokens[3],(string)str);
    cout<<" sigma stored into $"<<tokens[3];
@@ -1270 +1255 @@
  if(tokens.size()>2) {
    if(omg.HasVar(tokens[2])) omg.DeleteVar(tokens[2]);
-   char str[128]; sprintf(str,"%.8f",mean);
+   char str[512]; sprintf(str,"%.8f",mean);
    omg.SetVar(tokens[2],(string)str);
    cout<<" stored into $"<<tokens[2];
@@ -1402 +1387 @@
 }
 
-/* --Methode-- */
-void skymapmoduleExecutor::VarOper(vector<string>& tokens)
-{
- NamedObjMgr omg;
-
- double var1=0., var2=0.; string op = "?";
- if(tokens.size()>0) var1 = atof(tokens[0].c_str());
- if(tokens.size()>1) op = tokens[1];
- if(tokens.size()>2) if(tokens[2][0]!='!') var2 = atof(tokens[2].c_str());
-
- double result = 0.;
- try {
-   if(op=="+")                     result = var1 + var2;
-   else if(op=="-")                result = var1 - var2;
-   else if(op=="*")                result = var1 * var2;
-   else if(op=="/" && var2!=0.)    result = var1 / var2;   else if(op=="^" && var2>0.)     result = pow(var1,var2);
-   else if(op=="pow" && var2>0.)   result = pow(var1,var2);
-   else if(op=="exp")              result = exp(var1);
-   else if(op=="sqrt" && var1>0.)  result = sqrt(var1);
-   else if(op=="log" && var1>0.)   result = log(var1);
-   else if(op=="log10" && var1>0.) result = log10(var1);
- } catch ( ... ) {
-   cout<<"An operation exception occurs"<<endl;
-   return;
- }
-
- cout<<"VarOper: "<<var1<<" "<<op<<" "<<var2<<" = "<<result;
-
- if(tokens.size()>3) {
-   if(omg.HasVar(tokens[3])) omg.DeleteVar(tokens[3]);
-   char str[128]; sprintf(str,"%.8f",result);
-   omg.SetVar(tokens[3],(string)str);
-   cout<<" stored into $"<<tokens[3];
- }
- cout<<endl;
-
-}
-
 ////////////////////////////////////////////////////////////
 

trunk/SophyaPI/ProgPI/skymapmodule.pic

@@ -436 +436 @@
 echo mean=$mean sig=$sig
 
-#---------------------- test VarOper
-varop 1000 + 100 result
-  echo result is $result
-varop 1000 - 100 result
-  echo result is $result
-varop 1000 * 100 result
-  echo result is $result
-varop 1000 / 100 result
-  echo result is $result
-varop 1000 / 0 result
-  echo result is $result
-
-varop 1000 sqrt ! result
-  echo result is $result
-varop -1000 sqrt ! result
-  echo result is $result
-varop 10 exp ! result
-  echo result is $result
-varop 1000 log ! result
-  echo result is $result
-varop -1000 log ! result
-  echo result is $result
-varop 1000 log10 ! result
-  echo result is $result
-varop -1000 log10 ! result
-  echo result is $result
-
-varop 1000 pow 2 result
-  echo result is $result
-varop 1000 pow 1000 result
-  echo result is $result
+#---------------------- test ExpVal
+set x 1
+set y 2
+set z 3
+eval ! x +y +z
+eval ! $x +$y +$z
+eval r x +y +z
+ echo result is $r
+
+eval r 1e150
+ echo result is $r
+eval r 1e10
+ echo result is $r
+eval r 0
+ echo result is $r
+
+eval r sqrt(-1.)
+ echo $r

trunk/SophyaPI/ProgPI/sopiamodule.cc

@@ -273 +273 @@
 
    int wrsid = 0;
-   bool fgsr = true;
+   //bool fgsr = true;
    
    string name = "mollgrid";