Changeset 2592 in Sophya for trunk/SophyaProg/Tests/tcmd.cc

Timestamp:

Aug 9, 2004, 11:38:58 AM (21 years ago)

Author:

ansari

Message:

amelioaration programme tcmd (Test Commander/CExpEvaluator/RPNEvaluator) - Reza 9 Aout 2004

File:

• trunk/SophyaProg/Tests/tcmd.cc (modified) (8 diffs)

trunk/SophyaProg/Tests/tcmd.cc

@@ -58 +58 @@
 
   if (narg < 2) {
-    cout << " Usage: tcmd commander/cexptst/rpntst \n " 
-         << "  - commander: Commader class test \n"
-         << "  - cexptst: CExpressionEvaluator class test \n"
-         << "  - rpntst: RPNExpressionEvaluator class test \n" << endl;
+    cout << " Usage: tcmd S=commander/cexptst/rpntst \n" 
+         << "  S= commander: Commader class test \n"
+         << "  S= cexptst: CExpressionEvaluator class test \n"
+         << "  S= rpntst: RPNExpressionEvaluator class test \n" << endl;
     return 0;
   }
@@ -68 +68 @@
   InitTim();
   int rc = 0;
+  cout << " ---- tcmd S= " << opt << " (commander/evaluator test) " << endl;
   try {
     if (opt == "commander") {
@@ -75 +76 @@
     }
     else if (opt == "cexptst") rc = tst_cexpreval();
-    else rc = tst_rpneval();
-  } 
+    else if (opt == "rpntst")   rc = tst_rpneval();
+    else {
+      cout << " tcmd/error: Unknown select option: " << opt << endl;
+      rc = 9;
+    }
+  }
  
   catch (PThrowable & exc) {
@@ -82 +87 @@
          << " - Msg= " << exc.Msg() << endl;
   }
+  catch (exception & e) {
+    cerr << " exception catched : e.what()= " << e.what() << endl;
+  }
   catch (...) {
     cerr << " some other exception was caught ! " << endl;
@@ -87 +95 @@
 
   PrtTim(" End of tcmd ");
+  PrtTim("--Fin tcmd ");
   return(rc);
 }
@@ -135 +144 @@
     try {
       num++;
+      CExpressionEvaluator cex("4.e-1");
+      cout << "CExpr=" << cex; 
+      cout << " -> cex.Value() = " << cex.Value() << " =? " << ( res=4.e-1 ) << endl;
+      if (fabs(cex.Value()-res) > 1.e-9) {
+        cout << " ERREUR CALCUL " << cex << endl;
+        nerr++;
+      } 
+      else nok++;
+    }
+    catch (CExprException& err) {
+      nerrparse++;
+      cout << "Exp[" << num << "]  Exception: " << err.Msg() << endl; 
+    }
+    cout << "  [" << num << "] CExprBase::NbCreate() = " << CExprBase::NbCreate() 
+         << "CExprBase::NbDelete()=" <<  CExprBase::NbDelete() << endl;
+
+    try {
+      num++;
       CExpressionEvaluator cex("4*3+8");
       cout << "CExpr=" << cex; 
@@ -266 +293 @@
 
     // Expression avec erreur de syntaxe 
+   cout << " >>>>> Expression avec erreur <<<<<< " << endl;
    try {
       num++;    
@@ -313 +341 @@
   cout << "-------- CExprBase::NbCreate() = " << CExprBase::NbCreate() << " CExprBase::NbDelete()=" <<  CExprBase::NbDelete() << endl;
   cout << "--- NExpr= " << num << " NOk= " <<  nok << " NErr=" << nerr << " NErrParse=" << nerrparse << endl;
-  return 0;
+  if ( (nok == 8) && (nerr == 0) && (nerrparse == 3) ) return 0;
+  else return 99;
 }