nimbus 0.2 → 0.3

data/lib/nimbus.rb

@@ -28,7 +28,7 @@ module Nimbus
     end
     
     # Stops the execution of the Nimbus application.
-    def stop(msg = "Error: Nimbus finished.")  # :nodoc:
+    def stop(msg = "Error: Nimbus finished.")
       STDERR.puts msg
       exit(false)
     end

data/lib/nimbus/configuration.rb

@@ -142,7 +142,7 @@ module Nimbus
       Nimbus.message "* Nimbus configured with the following parameters: "
       Nimbus.message "*   Forest size: #{@forest_size} trees"
       Nimbus.message "*   Total SNP count: #{@tree_SNP_total_count}"
-      Nimbus.message "*   SNPs sample size (mtry): #{@SNP_sample_size}"
+      Nimbus.message "*   SNPs sample size (mtry): #{@tree_SNP_sample_size}"
       Nimbus.message "*   Maximum number of branches per tree: #{@tree_max_branches}"
       Nimbus.message "*   Minimun node size in tree: #{@tree_node_min_size}"
       Nimbus.message "*" * 50

data/lib/nimbus/forest.rb

@@ -9,6 +9,7 @@ module Nimbus
       @options = config
       @size = config.forest_size
       @predictions = {}
+      @times_predicted =[]
       raise Nimbus::ForestError, "Forest size parameter (#{@size}) is invalid. You need at least one tree." if @size < 1
     end
     
@@ -46,15 +47,17 @@ module Nimbus
       preds.each_pair.each{|id, value|
         if @predictions[id].nil?
           @predictions[id] = value
+          @times_predicted[id] = 1.0
         else
           @predictions[id] += value
+          @times_predicted[id] += 1
         end
       }
     end
     
     def average_predictions
       @predictions.each_pair{|id, value|
-        @predictions[id] = (@predictions[id] / @size).round(5)
+        @predictions[id] = (@predictions[id] / @times_predicted[id]).round(5)
       }
     end
     

data/spec/nimbus_spec.rb

@@ -1,3 +1,2 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/spec_helper'
-
+require File.dirname(__FILE__) + '/spec_helper'

metadata

@@ -2,7 +2,7 @@
 name: nimbus
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - "Juanjo Baz\xC3\xA1n"
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 Z
+date: 2011-08-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec