[ecspy] r130 committed - Updated some documentation and am readying to work on a better test su...

[ec...@googlecode.com]

Revision: 130
Author: aaron.lee.garrett
Date: Tue Feb 7 19:02:51 2012
Log: Updated some documentation and am readying to work on a better
test suite for newer operators.
http://code.google.com/p/ecspy/source/detail?r=130

Modified:
/trunk/ecspy/evaluators.py
/trunk/ecspy/observers.py
/trunk/ecspy/terminators.py

=======================================
--- /trunk/ecspy/evaluators.py Sat Feb 4 21:42:21 2012
+++ /trunk/ecspy/evaluators.py Tue Feb 7 19:02:51 2012
@@ -103,18 +103,13 @@
documentation for Parallel Python.

"""
- try:
- import pp
- except ImportError:
- print '''Parallel Python is not installed...\n
- The parallel_evaluation_pp function requires Parallel Python.\n'''
- raise
+ import pp
logger = args['_ec'].logger

try:
evaluator = args['pp_evaluator']
except KeyError:
- logger.error('\'mp_evaluator\' is not in the keyword arguments
list')
+ logger.error('parallel_evaluation_pp requires \'pp_evaluator\' be
defined in the keyword arguments list')
raise
try:
job_server = args['_pp_job_server']
@@ -173,18 +168,13 @@

"""
import time
- try:
- import multiprocessing
- except ImportError:
- print '''multiprocessing is not installed...\n
- ecspy has been designed to work with Python 2.6, which has
multiprocessing as a standard library\n'''
- raise
+ import multiprocessing
logger = args['_ec'].logger

try:
evaluator = args['mp_evaluator']
except KeyError:
- logger.error('\'mp_evaluator\' is not in the keyword arguments
list')
+ logger.error('parallel_evaluation_mp requires \'mp_evaluator\' be
defined in the keyword arguments list')
raise
try:
nprocs = args['mp_num_cpus']
@@ -196,9 +186,9 @@
pickle.dumps(args[key])
mp_args[key] = args[key]
except (TypeError, pickle.PickleError, pickle.PicklingError):
- logger.debug('in mp_evaluator: unable to pickle args
parameter %s' % key)
+ logger.debug('unable to pickle args parameter %s in
parallel_evaluation_mp' % key)
pass
-
+
start = time.time()
try:
pool = multiprocessing.Pool(processes=nprocs)
@@ -206,9 +196,9 @@
pool.close()
return [r.get()[0] for r in results]
except (OSError, RuntimeError) as e:
- logger.error('failed parallel fitness evaluation using
multiprocessing')
+ logger.error('failed parallel_evaluation_mp')
raise
else:
end = time.time()
- logger.debug('completed parallel evaluation in %f seconds' % (end
- start))
-
+ logger.debug('completed parallel_evaluation_mp in %f seconds' %
(end - start))
+
=======================================
--- /trunk/ecspy/observers.py Sat Feb 4 21:42:21 2012
+++ /trunk/ecspy/observers.py Tue Feb 7 19:02:51 2012
@@ -64,7 +64,7 @@

print('Generation Evaluation Worst Best Median
Average Std Dev ')
print('---------- ---------- ---------- ---------- ----------
---------- ----------')
- print('{0:10} {1:10} {2:10} {3:10} {4:10} {5:10}
{6:10}\n'.format(num_generations, num_evaluations, worst_fit, best_fit,
med_fit, avg_fit, std_fit))
+ print('{0:10} {1:10} {2:10.5} {3:10.5} {4:10.5} {5:10.5}
{6:10.5}\n'.format(num_generations, num_evaluations, worst_fit, best_fit,
med_fit, avg_fit, std_fit))
print('Current Population:')
for ind in population:
print(str(ind))
=======================================
--- /trunk/ecspy/terminators.py Tue Jun 7 11:29:18 2011
+++ /trunk/ecspy/terminators.py Tue Feb 7 19:02:51 2012
@@ -170,8 +170,8 @@

Optional keyword arguments in args:

- *start_time* -- the time from which to start measuring (default None)
- *max_time* -- the maximum time that should elapse (default None)
+ - *start_time* -- the time from which to start measuring (default None)
+ - *max_time* -- the maximum time that should elapse (default None)

"""
start_time = args.setdefault('start_time', None)