rubyneat_dashboard 0.4.0.alpha.4.pre.1 → 0.4.0.alpha.6

data/app/js/dashboard/controllers/population_controller.coffee

@@ -1,14 +1,17 @@
-@PopulationController = ($scope, populationService) ->
+@PopulationController = ($scope, $timeout, populationHistoryService) ->
   $scope.init = ->
     $scope.entry = {}
-    $scope.entries = []
-    populationService.getMessages (message) ->
-        $scope.$apply ->
+    populationHistoryService.getMessages (message) ->
+        $timeout ->
           p = message.payload
+
           $scope.entry = {
             generation: p.generation
+            pop_name: p.pop_name
             best: p.fitness.best
+            best_name: p.fitness.best_name
             overall: p.fitness.overall
             worst: p.fitness.worst
+            worst_name: p.fitness.worst_name
           }
-          $scope.entries.push $scope.entry
+        , 0, true

data/app/js/dashboard/directives/critter_genotype_topology.coffee

@@ -1,4 +1,4 @@
-@DashboardApp.directive 'critter-genotype-topology', ->
+@DashboardApp.directive 'critterGenotypeTopology', ->
   link = (scope, element, attr) ->
 
     # put D3 code here

data/app/js/dashboard/directives/critter_ice.coffee

@@ -0,0 +1,5 @@
+@DashboardApp.directive 'critterIce', ->
+  link: (scope, element, attr) ->
+    # code begin
+    # code end
+  restrict: "E"

data/app/js/dashboard/directives/critter_phenotype_topology.coffee

@@ -1,4 +1,4 @@
-@DashboardApp.directive 'critter-phenotype-topology', ->
+@DashboardApp.directive 'critterPhenotypeTopology', ->
   link = (scope, element, attr) ->
 
     # put D3 code here

data/app/js/dashboard/directives/critter_sandbox.coffee

@@ -0,0 +1,5 @@
+@DashboardApp.directive 'critterSandbox', ->
+  link: (scope, element, attr) ->
+    # code begin
+    # code end
+  restrict: "E"

data/app/js/dashboard/directives/population_brigade.coffee

@@ -0,0 +1,65 @@
+@DashboardApp.directive 'populationBrigade', ->
+  link: (scope, el, attr) ->
+    # link code begin
+    margin =
+      top:     5
+      right:  10
+      bottom:  5
+      left:   10
+
+    box =
+      height:       h = scope.height || 160
+      width:        w = scope.width || 900
+      inner_height: h - margin.top - margin.bottom
+      inner_width:  w - margin.right - margin.left
+
+
+    config =
+      numOfPops:    scope.numberOfPops || 10
+
+    icon =
+      uri:    "/images/population_sprite.050.png"
+      width:  50
+      height: 148
+      bottom: 10
+
+    range =
+      x: d3.scale.linear().range([ box.width, 0]).domain([0, config.numOfPops])
+      y: d3.scale.linear().range([ box.height, 0 ])
+
+    svg = d3.select(el[0]).append('svg')
+      .attr('width', box.width).attr('height', box.height)
+      .append('g')
+      .attr("transform", "translate(" + margin.left + "," + margin.top + ")")
+
+    popboxes = []
+
+    update_brigade = (tick) ->
+      console.log tick
+
+    new_popbox = (i, name) ->
+      g = svg.append("g")
+        .attr("transform", "translate(#{range.x(i)}, #{0})")
+
+      g.append("image")
+        .attr("xlink:href", icon.uri)
+        .attr("width", icon.width)
+        .attr("height", icon.height)
+      g.append("text").text(name)
+        .attr("transform", "translate(#{icon.width / 2}, #{icon.height - icon.bottom}) rotate(-90)")
+      g
+
+    popboxes.push new_popbox(0, "many")
+    popboxes.push new_popbox(1, "moe")
+    popboxes.push new_popbox(2, "jack")
+
+    scope.$watch 'tickSource', (tick) ->
+      update_brigade tick
+
+    # link code end
+  restrict: "E"
+  scope:
+    width:         '='
+    height:        '='
+    tickSource:    '='
+    numberOfPops:  '='

data/app/js/dashboard/directives/population_progress_chart.coffee

@@ -7,6 +7,7 @@
     basis  = scope.basis || 'generation'
     xname  = scope.xaxisName || '**Generations**'
     yname  = scope.yaxisName || '**Fitness**'
+    data   = scope.data || []
 
     margin =
       top: 20
@@ -64,8 +65,8 @@
         scope.fitness
 
       update_domains = (fitness) ->
-        x.domain d3.extent data, (d) ->
-          d[basis]
+        x.domain d3.extent fitness[labels[0]].values, (d) ->
+          d.gen
 
         y.domain [ d3.min(labels, (c) ->
           d3.min fitness[c].values, (v) ->
@@ -155,7 +156,7 @@
         render_tick(tick) if tick.generation
       , true
 
-    datamessage scope.data
+    datamessage data
 
   link: link
   restrict: 'E'

data/app/js/dashboard/directives/population_window.coffee

@@ -0,0 +1,5 @@
+@DashboardApp.directive 'populationWindow', ->
+  link: (scope, element, attr) ->
+    # code begin
+    # code end
+  restrict: "E"

data/app/js/dashboard/services/population_service.coffee

@@ -1,5 +1,20 @@
 @DashboardApp.factory 'populationService', () ->
   source = new EventSource('/population')
+  receivers = []
   getMessages: (receiver) ->
+    receivers.push receiver
     source.onmessage = (event) ->
+      receivers.forEach (receiver) ->
         receiver(JSON.parse(event.data))
+
+@DashboardApp.factory 'populationHistoryService', (populationService) ->
+  history = []
+  populationService.getMessages (message) ->
+    history.push message
+
+  getMessages: (receiver) ->
+      history.forEach (message) ->
+        receiver(message)
+      populationService.getMessages (message) ->
+        receiver(message)
+

data/lib/rubyneat_dashboard.rb

@@ -27,14 +27,15 @@ module Dashboard
     register BowerDSL
 
     configure do
-      set port: 3912
+      set port: 3912 #TODO: Make this configurable from the DSL
       set static: true
-      set :bind, '0.0.0.0' #all interfaces
+      set :bind, '0.0.0.0' #TODO: Make this configurable from the DSL
       use Rack::CommonLogger, $log = ::Logger.new(::File.new('log/dashboard.log', 'a+'))
       $log.debug "Started Dashboard at #{Time.now}"
       Barista.add_preamble do |location|
         %{
-          /* DO NOT MODIFY -- compiled from #{location}
+          /* RubyNEAT Dashboard Generated -- compiled from #{location}
+           * DO NOT MODIFY
            */
         }
       end

data/rubyneat_dashboard.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rubyneat_dashboard 0.4.0.alpha.4.pre.1 ruby lib
+# stub: rubyneat_dashboard 0.4.0.alpha.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rubyneat_dashboard"
-  s.version = "0.4.0.alpha.4.pre.1"
+  s.version = "0.4.0.alpha.6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Fred Mitchell"]
-  s.date = "2014-08-03"
+  s.date = "2014-08-09"
   s.description = "\n  A web-based Dashboard for your RubyNEAT development,\n  http://localhost:3912\n  "
   s.email = "lordalveric@yahoo.com"
   s.extra_rdoc_files = [
@@ -39,6 +39,11 @@ Gem::Specification.new do |s|
     "app/css/vendor/normalize.css",
     "app/images/RubyNEAT_Dashboard_logo_full.xcf",
     "app/images/logo.png",
+    "app/images/population_sprite.050.png",
+    "app/images/population_sprite.100.png",
+    "app/images/population_sprite.200.png",
+    "app/images/population_sprite.svg",
+    "app/images/rubyneat_icon.svg",
     "app/js/dashboard.coffee",
     "app/js/dashboard/controllers/critters_controller.coffee",
     "app/js/dashboard/controllers/dashboard_controller.coffee",
@@ -46,9 +51,13 @@ Gem::Specification.new do |s|
     "app/js/dashboard/controllers/overview_controller.coffee",
     "app/js/dashboard/controllers/population_controller.coffee",
     "app/js/dashboard/directives/critter_genotype_topology.coffee",
+    "app/js/dashboard/directives/critter_ice.coffee",
     "app/js/dashboard/directives/critter_phenotype_topology.coffee",
+    "app/js/dashboard/directives/critter_sandbox.coffee",
     "app/js/dashboard/directives/pie.coffee",
+    "app/js/dashboard/directives/population_brigade.coffee",
     "app/js/dashboard/directives/population_progress_chart.coffee",
+    "app/js/dashboard/directives/population_window.coffee",
     "app/js/dashboard/services/population_service.coffee",
     "bower_components/angular-animate.css/.bower.json",
     "bower_components/angular-animate.css/README.md",
@@ -1278,6 +1287,8 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, ["~> 1"])
+      s.add_runtime_dependency(%q<sinatra-assetpack>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra-contrib>, [">= 0"])
       s.add_runtime_dependency(%q<thin>, [">= 0"])
       s.add_runtime_dependency(%q<haml>, ["~> 4"])
       s.add_runtime_dependency(%q<sass>, ["~> 3"])
@@ -1285,9 +1296,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json-stream>, ["~> 0"])
       s.add_runtime_dependency(%q<compass>, [">= 0"])
       s.add_runtime_dependency(%q<barista>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra-assetpack>, [">= 0"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
       s.add_runtime_dependency(%q<queue_ding>, [">= 0"])
+      s.add_runtime_dependency(%q<rubyneat>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2"])
       s.add_development_dependency(%q<yard>, ["~> 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3"])
@@ -1297,6 +1308,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<semver>, ["~> 1"])
     else
       s.add_dependency(%q<sinatra>, ["~> 1"])
+      s.add_dependency(%q<sinatra-assetpack>, [">= 0"])
+      s.add_dependency(%q<sinatra-contrib>, [">= 0"])
       s.add_dependency(%q<thin>, [">= 0"])
       s.add_dependency(%q<haml>, ["~> 4"])
       s.add_dependency(%q<sass>, ["~> 3"])
@@ -1304,9 +1317,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<json-stream>, ["~> 0"])
       s.add_dependency(%q<compass>, [">= 0"])
       s.add_dependency(%q<barista>, [">= 0"])
-      s.add_dependency(%q<sinatra-assetpack>, [">= 0"])
       s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<queue_ding>, [">= 0"])
+      s.add_dependency(%q<rubyneat>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2"])
       s.add_dependency(%q<yard>, ["~> 0"])
       s.add_dependency(%q<rdoc>, ["~> 3"])
@@ -1317,6 +1330,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, ["~> 1"])
+    s.add_dependency(%q<sinatra-assetpack>, [">= 0"])
+    s.add_dependency(%q<sinatra-contrib>, [">= 0"])
     s.add_dependency(%q<thin>, [">= 0"])
     s.add_dependency(%q<haml>, ["~> 4"])
     s.add_dependency(%q<sass>, ["~> 3"])
@@ -1324,9 +1339,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<json-stream>, ["~> 0"])
     s.add_dependency(%q<compass>, [">= 0"])
     s.add_dependency(%q<barista>, [">= 0"])
-    s.add_dependency(%q<sinatra-assetpack>, [">= 0"])
     s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<queue_ding>, [">= 0"])
+    s.add_dependency(%q<rubyneat>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2"])
     s.add_dependency(%q<yard>, ["~> 0"])
     s.add_dependency(%q<rdoc>, ["~> 3"])

data/views/overview.haml

@@ -1,6 +1,31 @@
-%h1 Overview
-
-%pie(data = "[2,1,6,4]")
-  Wheeeee!
-
-
+%h3 Population Progress Overview
+.pop(ng-controller = 'PopulationController' ng-init = "init()")
+  .charting
+    %population-progress-chart(labels = "['best', 'worst', 'overall']"
+      basis = "'generation'"
+      width = "900"
+      height = "400"
+      xaxis-name = "Generation"
+      yaxis-name = "Fitness"
+      tick-source = "entry"
+    )
+  .current
+    %h3 Realtime Status
+    .realtime
+      %table
+        %tr
+          %td generation
+          %td {{ entry.generation | number:0 }}
+          %td {{ entry.pop_name }}
+        %tr
+          %td best
+          %td {{ entry.best | number:4 }}
+          %td {{ entry.best_name }}
+        %tr
+          %td worst
+          %td {{ entry.worst | number:4 }}
+          %td {{ entry.worst_name }}
+        %tr
+          %td overall
+          %td {{ entry.overall | number:4 }}
+          %td

data/views/population/home.haml

@@ -1,28 +1,10 @@
-%h1 Population Home
+%h3 Population Drilldown
 .pop(ng-controller = 'PopulationController' ng-init = "init()")
-  .charting
-    %population-progress-chart(labels = "['best', 'worst', 'overall']"
-      basis = "'generation'"
-      width = "900"
-      height = "400"
-      xaxis-name = "Generation"
-      yaxis-name = "Fitness"
-      data = "entries"
-      tick-source = "entry"
-    )
-  .current
-    %h2 Realtime Status
-    %table
-      %tr
-        %td generation
-        %td {{ entry.generation }}
-      %tr
-        %td best
-        %td {{ entry.best }}
-      %tr
-        %td worst
-        %td {{ entry.worst }}
-      %tr
-        %td overall
-        %td {{ entry.overall }}
+  .pop-brigade
+    %population-brigade(tick-source = "entry" number-of-pops = "20")
+      Wheeeee!
+  .pop-window
+    %population-window()
 
+  .pop-sandbox
+    %critterSandbox()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyneat_dashboard
 version: !ruby/object:Gem::Version
-  version: 0.4.0.alpha.4.pre.1
+  version: 0.4.0.alpha.6
 platform: ruby
 authors:
 - Fred Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: sinatra-assetpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra-assetpack
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: queue_ding
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: queue_ding
+  name: rubyneat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -291,6 +319,11 @@ files:
 - app/css/vendor/normalize.css
 - app/images/RubyNEAT_Dashboard_logo_full.xcf
 - app/images/logo.png
+- app/images/population_sprite.050.png
+- app/images/population_sprite.100.png
+- app/images/population_sprite.200.png
+- app/images/population_sprite.svg
+- app/images/rubyneat_icon.svg
 - app/js/dashboard.coffee
 - app/js/dashboard/controllers/critters_controller.coffee
 - app/js/dashboard/controllers/dashboard_controller.coffee
@@ -298,9 +331,13 @@ files:
 - app/js/dashboard/controllers/overview_controller.coffee
 - app/js/dashboard/controllers/population_controller.coffee
 - app/js/dashboard/directives/critter_genotype_topology.coffee
+- app/js/dashboard/directives/critter_ice.coffee
 - app/js/dashboard/directives/critter_phenotype_topology.coffee
+- app/js/dashboard/directives/critter_sandbox.coffee
 - app/js/dashboard/directives/pie.coffee
+- app/js/dashboard/directives/population_brigade.coffee
 - app/js/dashboard/directives/population_progress_chart.coffee
+- app/js/dashboard/directives/population_window.coffee
 - app/js/dashboard/services/population_service.coffee
 - bower_components/angular-animate.css/.bower.json
 - bower_components/angular-animate.css/README.md