joule 1.0.3 → 1.0.4

data/Rakefile

@@ -20,8 +20,8 @@ spec = Gem::Specification.new do |s|
   s.description = "Joule parses and does some basic analyzing of powermeter data. Supported formats include SRM(.srm), Saris PowerTap(.csv), iBike(.csv), and Garmin(.tcx)"
   s.homepage = "http://github.com/anolson/joule"
   
-  s.version = "1.0.3"
-  s.date = "2010-9-21"
+  s.version = "1.0.4"
+  s.date = "2011-4-28"
   
   s.authors = ["Andrew Olson"]
   s.email = "anolson@gmail.com"

data/lib/joule/calculator/power_calculator.rb

@@ -21,10 +21,10 @@ module Joule
         peak_power
       end
     
-      def self.training_stress_score(duration_seconds, threshold_power)
+      def self.training_stress_score(duration_seconds, normalized_power, threshold_power)
         if(threshold_power > 0)
           normalized_work = normalized_power * duration_seconds
-          raw_training_stress_score = normalized_work * intensity_factor(threshold_power)
+          raw_training_stress_score = normalized_work * intensity_factor(normalized_power, threshold_power)
           (raw_training_stress_score/(threshold_power * 3600)) * 100
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: joule
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Andrew Olson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 -04:00
+date: 2011-04-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A Ruby library for parsing bicycle powermeter data.