diff options
| author | David Robillard <d@drobilla.net> | 2013-01-15 21:53:48 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-01-15 21:53:48 +0000 |
| commit | 69c8cde985cc012b6cae2a49d489553c5be67202 (patch) | |
| tree | 08411dfc9fcf48660c7467d9140f3c35b16464ee /src/engine/machina/Machine.hpp | |
| parent | 987eaa018039cb891ffeca60b413a00b1f7da299 (diff) | |
| download | machina-69c8cde985cc012b6cae2a49d489553c5be67202.tar.gz machina-69c8cde985cc012b6cae2a49d489553c5be67202.tar.bz2 machina-69c8cde985cc012b6cae2a49d489553c5be67202.zip | |
Compile against latest Eugene (evolution still doesn't work, though).
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4994 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/machina/Machine.hpp')
| -rw-r--r-- | src/engine/machina/Machine.hpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/engine/machina/Machine.hpp b/src/engine/machina/Machine.hpp index a4d0262..cd94391 100644 --- a/src/engine/machina/Machine.hpp +++ b/src/engine/machina/Machine.hpp @@ -19,7 +19,6 @@ #include <vector> #include <set> -#include <boost/utility.hpp> #include "machina/types.hpp" #include "raul/Atom.hpp" @@ -37,8 +36,7 @@ class LearnRequest; /** A (Finite State) Machine. */ -class Machine - : public Stateful +class Machine : public Stateful { public: explicit Machine(TimeUnit unit); @@ -53,6 +51,8 @@ public: /** Completely replace this machine's contents with a deep copy. */ Machine& operator=(const Machine& copy); + bool operator==(const Machine& rhs) const; + /** Merge another machine into this machine. */ void merge(const Machine& machine); @@ -95,6 +95,8 @@ public: SPtr<Node> random_node(); SPtr<Edge> random_edge(); + float fitness; // For GA + private: // Audio context SPtr<Node> earliest_node() const; @@ -117,6 +119,7 @@ private: SPtr<LearnRequest> _pending_learn; Nodes _nodes; Raul::TimeStamp _time; + bool _is_finished; }; |