Thomas Wiecki 7491e1f88e Resolved internal conflict due to stashing.

2012-08-23 16:06:50 -04:00

..

__init__.py

Moved over files from optimize and incorporated into new infrastructure. Temporarily fixed control_out bug. get_id() bug remains however.

2012-05-14 18:02:40 -04:00

algorithms.py

Resolved internal conflict due to stashing.

2012-08-23 16:06:50 -04:00

example.py

Resolved conflicts

2012-08-23 10:54:02 -04:00

factory.py

Resolved internal conflict due to stashing.

2012-08-23 16:06:50 -04:00