- some minor stuff:

- Math.sign/1 - Sync @Tolerance (commented)
zampino · Oct 18, 2015 · 303c3e1 · 303c3e1
1 parent b027724
commit 303c3e1
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 deletions.
diff --git a/lib/exnn/actuator.ex b/lib/exnn/actuator.ex
@@ -31,6 +31,7 @@ defmodule EXNN.Actuator do
       defimpl EXNN.Connection do
         def signal(actuator, message, metadata) do
           state = unquote(caller).act(actuator, message, metadata)
+          # TODO: pass actuator state to fitness as well
           unquote(caller).notify_fitness(message, metadata)
           state
         end

diff --git a/lib/exnn/events/manager.ex b/lib/exnn/events/manager.ex
@@ -16,7 +16,7 @@ defmodule EXNN.Events.Manager do
   end
 
   # SERVER CALLBACKS
-  
+
   def handle_event({:fitness, {message, metadata}}, messages) do
     :ok = EXNN.Fitness.eval message, metadata
     {:ok, messages}

diff --git a/lib/exnn/fitness.ex b/lib/exnn/fitness.ex
@@ -34,7 +34,6 @@ defmodule EXNN.Fitness do
       end
 
       # internal api
-
       def eval(_message, _meta, _state) do
         raise "NotImplementedError"
       end
@@ -44,7 +43,6 @@ defmodule EXNN.Fitness do
       end
 
       # server callbacks
-
       def handle_cast {:eval, message, meta}, state do
         {:noreply, eval(message, meta, state)}
       end

diff --git a/lib/exnn/genome.ex b/lib/exnn/genome.ex
@@ -20,12 +20,12 @@ defmodule EXNN.Genome do
     ids |> Enum.map &build(type, &1)
   end
 
+  def random_bias, do: (Math.pi * Random.uniform)
+
   def build(:neuron, id) do
-    %{type: :neuron, id: id, bias: random_bias, activation: &Math.sin(&1)}
+    %{type: :neuron, id: id, activation: &Math.sin(&1), bias: random_bias}
   end
 
-  def random_bias, do: Math.pi * Random.uniform
-
   def build(type, id) do
     %{type: type, id: id}
   end

diff --git a/lib/exnn/trainer/mutations/set.ex b/lib/exnn/trainer/mutations/set.ex
@@ -13,7 +13,7 @@ defmodule EXNN.Trainer.Mutations.Set do
     # :delete_link,
     # :add_node,
     # :remove_node
-    :alter_bias
+    # :alter_bias
     # :alter_activation
     # :swap_activation
   ]

diff --git a/lib/exnn/trainer/sync.ex b/lib/exnn/trainer/sync.ex
@@ -3,6 +3,8 @@ defmodule EXNN.Trainer.Sync do
   import EXNN.Utils.Logger
   alias EXNN.Trainer.Mutations
 
+  @tolerance 0.001
+
   @train_interval 100
 
   def start_link do
@@ -49,15 +51,22 @@ defmodule EXNN.Trainer.Sync do
     {:ok, ref}
   end
 
+  # def handle_call({:sync, %{fitness: value}}, _from, state)
+  #   when value > 1 - @tolerance do
+  #   log "PASS", ""
+  #   schedule_training_task state.sensors
+  #   {:reply, :ok, %{state | counter: state.counter + 1}}
+  # end
+
   def handle_call {:sync, %{fitness: value}}, _from, state do
     new_state = cond do
-      state.counter > state.max_attempts -> exit(:normal)
+      state.counter > state.max_attempts      -> exit(:normal)
       state.reverts_count > state.max_reverts -> reset(state)
-      value <= state.fitness -> less_fit(state)
-      true -> fitter(state, value)
+      value <= state.fitness                  -> less_fit(state)
+      true                                    -> fitter(state, value)
     end
     Mutations.step
-    {:ok, _ref} = schedule_training_task state.sensors
+    schedule_training_task state.sensors
     log "STATS:", state, :info
     {:reply, :ok, %{new_state | counter: new_state.counter + 1}}
   end

diff --git a/lib/exnn/utils/math.ex b/lib/exnn/utils/math.ex
@@ -4,6 +4,12 @@ defmodule EXNN.Utils.Math do
 
   def id(x), do: x
 
+  def sign(0), do: 0
+  def sign(0.0), do: 0
+  def sign(x) do
+    :erlang.trunc(abs(x)/x)
+  end
+
   def tanh(x), do: :math.tanh(x)
 
   def sqrt(x), do: :math.sqrt(x)