Merge pull request #39 from FL03/dev-v0.3.0

Dev v0.3.0

Cargo.toml

@@ -18,7 +18,7 @@ members = [
     "acme",
     "core",
     "derive",
-    "macros",
+    "macros"
 ]
 resolver = "2"
 

acme/src/agents/agent.rs

@@ -2,3 +2,14 @@
     Appellation: agent <module>
     Contrib: FL03 <jo3mccain@icloud.com>
 */
+use super::{Architecture, AgentProgram};
+
+pub trait Agent {
+    type Arch: Architecture;
+    type Program: AgentProgram;
+}
+
+
+pub struct SimpleAgent {
+
+}

acme/src/agents/environment.rs

@@ -4,3 +4,7 @@
 */
 
 pub trait Environment {}
+
+pub trait Percept {
+
+}

acme/src/agents/mod.rs

@@ -24,13 +24,11 @@ pub enum AgentType {
 pub trait Architecture {
     type Actuator: Actuator;
     type Observer: Observer;
-}
 
-pub trait Agent {
-    type Arch: Architecture;
-    type Program: AgentProgram;
+    fn actuators(&self) -> Vec<Box<dyn Actuator>>;
 }
 
+
 pub trait Observer {
     type Observation;
     type Reward;
@@ -64,12 +62,6 @@ pub trait AgentFunction {
     type Action;
     type Env: Environment;
     type Params;
-    type Reward;
-    type State;
 
-    fn agent_fn(
-        &self,
-        params: Self::Params,
-        env: &mut Self::Env,
-    ) -> (Self::Action, Self::Reward, Self::State);
+    fn compute(&self, params: Self::Params, env: &mut Self::Env) -> Self::Action;
 }