Moved out of the 'obsolete' directory a couple of honest classes, which didn't harm anybody; activated also in Makefile.am the program that tested them

eo/src/utils/eoParser.cpp

@@ -36,7 +36,7 @@ eoParameterLoader::~eoParameterLoader()
 }
 
 
-eoParser::eoParser ( int _argc, char **_argv , string _programDescription, string _lFileParamName, char _shortHand) : 
+eoParser::eoParser ( unsigned _argc, char **_argv , string _programDescription, string _lFileParamName, char _shortHand) : 
     programName( _argv[0]),
     programDescription( _programDescription), 
     needHelp(false, "help", "Prints this message", 'h')

eo/src/utils/eoParser.h

@@ -23,7 +23,9 @@
              mkeijzer@dhi.dk
  */
 //-----------------------------------------------------------------------------
-
+/**
+CVS Info: $Date: 2001-02-13 22:35:07 $ $Header: /home/nojhan/dev/eodev/eodev_cvs/eo/src/utils/eoParser.h,v 1.7 2001-02-13 22:35:07 jmerelo Exp $ $Author: jmerelo $ $Log$
+*/
 #ifndef eoParser_h
 #define eoParser_h
 
@@ -111,7 +113,7 @@ public:
    * @param _lFileParamName         Name of the parameter specifying the configuration file (--param-file)
    * @param _shortHand              Single charachter shorthand for specifying the configuration file
    */
-  eoParser ( int _argc, char **_argv , string _programDescription = "", 
+  eoParser ( unsigned _argc, char **_argv , string _programDescription = "", 
 	   string _lFileParamName = "param-file", char _shortHand = 'p');  
   
   /**

eo/src/utils/eoRnd.h

@@ -21,7 +21,9 @@
     Contact: todos@geneura.ugr.es, http://geneura.ugr.es
  */
 //-----------------------------------------------------------------------------
-
+/**
+CVS Info: $Date: 2001-02-13 22:35:07 $ $Header: /home/nojhan/dev/eodev/eodev_cvs/eo/src/utils/Attic/eoRnd.h,v 1.1 2001-02-13 22:35:07 jmerelo Exp $ $Author: jmerelo $ $Log$
+*/
 #ifndef _EORND_H
 #define _EORND_H
 

eo/src/utils/eoUniform.h

@@ -21,6 +21,11 @@
 
     Contact: todos@geneura.ugr.es, http://geneura.ugr.es
 */
+
+/**
+CVS Info: $Date: 2001-02-13 22:35:07 $ $Header: /home/nojhan/dev/eodev/eodev_cvs/eo/src/utils/Attic/eoUniform.h,v 1.1 2001-02-13 22:35:07 jmerelo Exp $ $Author: jmerelo $ $Log$
+*/
+
 //-----------------------------------------------------------------------------
 
 #ifndef _EOUNIFORM_H
@@ -28,14 +33,19 @@
 
 //-----------------------------------------------------------------------------
 
-#include <eoRnd.h>
+#include <utils/eoRnd.h>
 #include <utils/eoRNG.h>
 
 //-----------------------------------------------------------------------------
 // Class eoUniform
 //-----------------------------------------------------------------------------
 
-/// Generates uniform random number over the interval [min, max)
+/** Generates uniform random number over the interval [min, max)
+Uses the global variable rng
+ */
+
+using eo::rng;
+
 template<class T>
 class eoUniform: public eoRnd<T>
 {

eo/test/Makefile.am

@@ -13,7 +13,8 @@ LDADDS = $(top_builddir)/src/libeo.a $(top_builddir)/src/utils/libeoutils.a
 CXXFLAGS = -g
 ###############################################################################
 
-check_PROGRAMS = t-eofitness t-eobin t-eoStateAndParser t-eoCheckpointing t-eoExternalEO t-eoSymreg t-eo t-eoReplacement t-eoSelect t-eoGenOp t-eoGA
+check_PROGRAMS = t-eofitness t-eoRandom t-eobin t-eoStateAndParser t-eoCheckpointing \
+	t-eoExternalEO t-eoSymreg t-eo t-eoReplacement t-eoSelect t-eoGenOp t-eoGA
 TESTS=run_tests
 # removing temporarily t-eoESFull
 #noinst_PROGRAMS = t-eofitness t-eobin t-eoStateAndParser t-eoCheckpointing t-eoExternalEO t-eoESFull t-eoSymreg t-eo t-eoReplacement t-eoSelect t-eoGenOp t-eoGA
@@ -24,6 +25,11 @@ TESTS=run_tests
 #t_eoESFull_DEPENDENCIES = $(DEPS)
 #t_eoESFull_LDFLAGS = -lm
 #t_eoESFull_LDADD = $(LDADDS)
+###############################################################################
+
+t_eoRandom_SOURCES = t-eoRandom.cpp
+t_eoRandom_DEPENDENCIES = $(DEPS)
+t_eoRandom_LDADD = $(LDADDS)
 
 ###############################################################################
 

eo/test/t-eoRandom.cpp

@@ -23,27 +23,29 @@
             
 */
 
+/**
+CVS Info: $Date: 2001-02-13 22:35:07 $ $Header: /home/nojhan/dev/eodev/eodev_cvs/eo/test/t-eoRandom.cpp,v 1.5 2001-02-13 22:35:07 jmerelo Exp $ $Author: jmerelo $ $Log$
+*/
 //-----------------------------------------------------------------------------
 
 #include <iostream>   // cout
 #include <strstream>  // ostrstream, istrstream
-#include <eoUniform.h>         // eoBin
+#include <utils/eoUniform.h>         // eoBin
-#include <eoNormal.h>
+//#include <eoNormal.h>
-#include <eoNegExp.h>
+//#include <eoNegExp.h>
 
 //-----------------------------------------------------------------------------
 
 main() {
-  eoNormal<float> n1(-2.5,3.5);
+  eoUniform<float> u1(-2.5,3.5);
-  eoNormal<double> n2(0.003, 0.0005 );
+  eoUniform<double> u2(0.003, 0.0005 );
-  eoNormal<unsigned long> n3( 10000000U, 10000U);
+  eoUniform<unsigned long> u3( 10000000U, 10000U);
-  eoNegExp<float> e1(3.5);
+  /*  eoNegExp<float> e1(3.5);
   eoNegExp<double> e2(0.003 );
   eoNegExp<long> e3( 10000U);
-  cout << "n1\t\tn2\t\tn3\t\te1\t\te2\t\te3" << endl;
+  cout << "n1\t\tn2\t\tn3\t\te1\t\te2\t\te3" << endl; */
   for ( unsigned i = 0; i < 100; i ++) {
-    cout << n1() << "\t" << n2() << "\t" << n3() << "\t" <<
+    cout << u1() << "\t" << u2() << "\t" << u3() << endl;
-      e1() << "\t" << e2() << "\t" << e3() << endl;
   }
  
   return 0; // to avoid VC++ complaints