Changeset 2307 in Sophya for trunk/SophyaPI

Timestamp:

Jan 8, 2003, 11:56:16 PM (23 years ago)

Author:

ansari

Message:

ajout fonction rand au RPNEvaluator - Reza 8/01/2003

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (2 diffs)
• piacmd.cc (modified) (6 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -55 +55 @@
 {
 Services2NObjMgr* srvo = mObjMgr->GetServiceObj();
-// ----> Sortie d'application
-if (kw == "exitpiapp") {
-  mImgApp->Stop();
-  return(0);
-}
 // >>>>> Chargement de modules
-else if (kw == "loadmodule") {
+if (kw == "loadmodule") {
   if (tokens.size() < 2) { cout << "Usage: loadmodule fnameso modulename" << endl;  return(0); }
   mpiac->LoadModule(tokens[0], tokens[1]);
@@ -1076 +1071 @@
 {
 string kw, usage;
-kw = "exitpiapp";
-usage = "To end the piapp session";
-mpiac->RegisterCommand(kw, usage, this, "Commands");
 kw = "loadmodule";
 usage = "To load and initialize modules \n  Usage: loadmodule fnameso modulename";

trunk/SophyaPI/PIext/piacmd.cc

@@ -12 +12 @@
 #include "strutilxx.h"
 // #include "dlftypes.h"
+#ifdef SANS_EVOLPLANCK
+#include "nbrand.h"
+#else
+#include "srandgen.h"
+#endif
 
 #include "pistdimgapp.h"
@@ -465 +470 @@
 usage += "  - sin(PI/6): pi 6 / sin \n";
 usage += "  - 1*2*...*5: 1 2 3 4 5 product \n";
-usage += "  - x = $x $y * \n";
+usage += "  - x=x+y: x = $x $y * \n";
 usage += "  >>> Stack operations : \n";
 usage += "      print x<>y pop push (duplicate x) \n";
@@ -478 +483 @@
 usage += "  >>> F(X,Y): (x,y) --> F(x,y) \n";
 usage += "      pow atan2 \n"; 
+usage += "  >>> F(): random number generators \n";
+usage += "      rand (flat 0..1) norand (normal/gaussian) \n"; 
 usage += "  >>> Stack sum/product/mean/sigma/sigma^2 \n";
 usage += "      sum product mean sigma sigma2 sigmean (y->sigma x->mean) \n"; 
+RegisterHelp(kw, usage, grp);
+
+kw = "autoiniranf";
+usage  = "> Automatic random number generator initialisation\n";
+usage += "   by Auto_Ini_Ranf(int lp) \n";
+usage += "   Usage: autoiniranf";
 RegisterHelp(kw, usage, grp);
 
@@ -490 +503 @@
 usage += "  > shell myfile.csh [arg1] [arg2] [...]\n";
 usage += "    (where the first line of \"myfile.csh\" is \"#!/bin/csh\")\n";
+RegisterHelp(kw, usage, grp);
+
+kw = "exitpiapp";
+usage = "To end the piapp session (Interpreter's command)";
 RegisterHelp(kw, usage, grp);
 
@@ -1401 +1418 @@
       rpnstack.top() = atan2(x,y);
     }
+    // generateur aleatoire
+    else if (args[k] == "rand") { 
+      double rnd = drand01();
+      rpnstack.push(rnd);
+    }
+    else if (args[k] == "norand") { 
+      double rnd = GauRnd(0., 1.);
+      rpnstack.push(rnd);
+    }
     // Fonction a N arguments  - Somme, produit, etc ...
     else if ((args[k] == "sum") || (args[k] == "mean") || (args[k] == "sigmean") || 
@@ -1668 +1694 @@
   ExecFile(tokens[0], tokens);
   }
+else if (kw == "autoiniranf") { 
+  Auto_Ini_Ranf(1);
+  return(0);
+}
+// ----> Sortie d'application
+else if (kw == "exitpiapp") {
+  mImgApp->Stop();
+  return(0);
+}
 else if (kw == "shell") {
   if (tokens.size() < 1) { cout << "PIACmd::Interpret() Usage: shell cmdline" << endl;  return(0); }