Merge branch 'master' of github.com:NateBarnes/hashiru

Author: Adam Zaninovich

Gemfile

@@ -15,7 +15,13 @@ gem 'pry'
 gem 'rb-libsvm', :require => 'libsvm'
 
 # Use sqlite3 as the database for Active Record
-gem 'sqlite3'
+group :development do
+  gem 'sqlite3'
+end
+
+group :production do
+  gem 'pg'
+end
 
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.0'

Gemfile.lock

@@ -105,6 +105,7 @@ GEM
       daemon_controller (>= 1.1.0)
       rack
       rake (>= 0.8.1)
+    pg (0.17.0)
     polyglot (0.3.3)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
@@ -191,6 +192,7 @@ DEPENDENCIES
   jbuilder (~> 1.2)
   jquery-rails
   passenger
+  pg
   pry
   rails (~> 4.0.0)
   rb-libsvm

app/models/user.rb

@@ -2,6 +2,7 @@ class User < ActiveRecord::Base
   include ActiveModel::ForbiddenAttributesProtection
   validates_presence_of :name, :gender, :mile_time, :longest_distance, :goal_type
   has_many :workouts, :dependent => :destroy
+  has_many :workout_exercises, :through => :workouts
   has_one :event
 
   after_save :recluster
@@ -59,4 +60,16 @@ def search_goal
     end
   end
 
+  def exercise_history exercise
+    hsh = {}
+    workout_exercises.where(:exercise_id => exercise.id).load.each do |workout_exercise|
+      JSON.parse(workout_exercise.exercise.units).each do |unit|
+        hsh.merge_or_add unit => [workout_exercise.measurements.where(:unit => unit).first.value]
+      end
+      hsh.merge_or_add "timestamps" => [workout_exercise.workout.day.to_i]
+    end
+
+    hsh
+  end
 end
+

app/models/workout.rb

@@ -15,12 +15,27 @@ def self.generate user
     workout = user.workouts.create day: Date.today, exercises: exercises
     workout.workout_exercises.each do |workout_exercise|
       JSON.parse(workout_exercise.exercise.units).each do |unit|
-        measurement = workout.measurements.build unit: unit, value: 5, workout_exercise_id: workout_exercise.id
+        measurement = workout.measurements.build unit: unit, value: predict_value(user, workout_exercise, unit), workout_exercise_id: workout_exercise.id
         measurement.save
       end
     end
     workout
   end
 
+  def self.predict_value user, workout_exercise, unit
+    val = 5
+    begin
+      units_hash = user.exercise_history workout_exercise.exercise
+      timestamps = units_hash.delete "timestamps"
+      lr = LinearRegression.new(timestamps.fetch("timestamps", []), units_hash.fetch(unit, default_array))
+
+      val = lr.predict(workout_exercise.workout.day.to_i)
+    rescue
+      puts "Rescuing Regression Prediction"
+    end
+
+    val
+  end
+
 end
 

config/actv.yml

@@ -1,3 +1,7 @@
 development:
   host: http://api.amp.active.com
   api_key: jsxev8samqc3jej5nyzp5b5x
+production:
+  host: http://api.amp.active.com
+  api_key: jsxev8samqc3jej5nyzp5b5x
+

config/sidekiq.yml

@@ -1,2 +1,5 @@
 development:
   host: redis://localhost:6379
+production:
+  host: redis://localhost:6379
+