data_modeler 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 173d569d4d705b32ca166d444766651f94b4a98d
-  data.tar.gz: ec61342d6188533751c874549c6f55d346d02bcb
+  metadata.gz: fb390503600e0270198476fd58e28fbeb7875b53
+  data.tar.gz: 5c57a5bdb492a069f4bfc6ffbec65b513fb94e82
 SHA512:
-  metadata.gz: 3cb220eeb8f7349321d35adb07efe919c9a23e9e0fe0459ca411b87632dd89ce21a7e1e04d350f1527e9e0f83b9924445b2c155c6af8fb9b71caace5b2600301
-  data.tar.gz: 74c46dea839cf5c1f99346ae197b7c87d06815c1d8c1e3c61238fac0801b6e20dd288efbaf7026f2a5991052c823a0179f48054473cbce4a628b5ff74f8b198d
+  metadata.gz: 1e951667d4207d4293ee9666ed786886528c496e272ea71e7ba7a885780ac5b84e2724f00d3beb97b5f143babe467c19881f3dd0014a4132816bc7e4188da734
+  data.tar.gz: d1b0bcc66cb30693d65370409d129a5102a9dfb6e65afca11be98efc125ba3b0c85df546feb01f2f5857445259cf441c9c7c60b150cda239ec6e5bc47c3a662e

data/lib/data_modeler.rb

@@ -1,3 +1,6 @@
+require 'pathname'
+require 'fileutils'
+
 require "data_modeler/support"
 
 # Dataset

data/lib/data_modeler/base.rb

@@ -42,9 +42,9 @@ class DataModeler::Base
       end
       model.reset
       model.train train_set, report_interval: report_interval
-      test_input, observations = tset_gen.test(nrun).values
+      times, test_input, observations = tset_gen.test(nrun).values
       predictions = model.test test_input
-      save_run nrun, model, [predictions, observations]
+      save_run nrun, model, [times, predictions, observations]
     end
   end
 
@@ -121,12 +121,12 @@ class DataModeler::Base
   # @param predobs [Array<Array<pred, obs>>] list of prediction-observation pairs
   # @return [void]
   # @note side effect: saves model and predobs to file system
-  def save_run nrun, model, predobs
+  def save_run nrun, model, tpredobs
     run_id = format '%02d', nrun
     model.save out_dir.join("model_#{run_id}.sav") if save_models?
-    CSV.open(out_dir.join("predobs_#{run_id}.csv"), 'wb') do |csv|
-      csv << targets.collect { |t| ["p_#{t}", "o_#{t}"] }.transpose.flatten
-      predobs.transpose.each { |po| csv << po.flatten }
+    CSV.open(out_dir.join("tpredobs_#{run_id}.csv"), 'wb') do |csv|
+      csv << (%w(time) + targets.collect { |t| ["p_#{t}", "o_#{t}"] }.transpose.flatten)
+      tpredobs.transpose.each { |tpo| csv << tpo.flatten }
     end
   end
 end

data/lib/data_modeler/dataset/dataset.rb

@@ -38,8 +38,6 @@ class DataModeler::Dataset
   end
 
   # TODO: make sure constructor requirements are unnecessary for static models
-  # TODO: check if enough data / minimum_target
-  # TODO: the check in `#init_target` should go in the `ds_gen`
 
   # Builds inputs for the model
   # @return [Array]
@@ -59,6 +57,12 @@ class DataModeler::Dataset
     end
   end
 
+  # Returns the time of the current target
+  # @return [type of `data[:time]`]
+  def trg_time
+    data[:time][target_idx]
+  end
+
   ### ITERATION
 
   # Returns the next pair [inputs, targets]
@@ -66,7 +70,7 @@ class DataModeler::Dataset
   # @raise [StopIteration] when the target index is past the dataset limits
   def peek
     raise StopIteration if target_idx >= end_idx
-    [inputs, targets]
+    [trg_time, inputs, targets]
   end
 
   # Returns the next pair [inputs, targets] and increments the target

data/lib/data_modeler/models/fann.rb

@@ -54,7 +54,7 @@ class DataModeler::Models::FANN
         report_interval: report_interval, desired_error: desired_error)
     end
     # TODO: optimize maybe?
-    inputs, targets = trainset.values
+    times, inputs, targets = trainset.values
     tset = RubyFann::TrainData.new inputs: inputs, desired_outputs: targets
     # fann.init_weights tset # test this weights initialization
 
@@ -73,7 +73,7 @@ class DataModeler::Models::FANN
     # check to improve performance
     fann.randomize_weights(*init_weights_range.map(&method(:Float)))
     # test it on inputs
-    inputs, targets = trainset.values
+    times, inputs, targets = trainset.values
     outputs = test(inputs)
     # calculate RMSE
     rmse_fn = -> (outs) do
@@ -99,7 +99,7 @@ class DataModeler::Models::FANN
   # @param inputs [Array<Array<inputs>>] sequence of inputs for the model
   # @return [Array<Array<outputs>>] outputs corresponding to each input
   def test inputs
-    inputs.collect { |i| fann.run i }
+    inputs.collect &fann.method(:run)
   end
 
   # Saves the model

data/lib/data_modeler/support.rb

@@ -5,7 +5,7 @@ module DataModeler
   ### VERSION
 
   # Version number
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 
   ### HELPER FUNCTIONS
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_modeler
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Giuseppe Cuccu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-fann