gthc 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdda8bbf24bf57f441c14c0c610014e2b1e19baeb6b9d3029e1f053bef3c90b9
-  data.tar.gz: 68c61801bf40ccd882e9d436e57bf77aac0710884f6b415114825537e4288094
+  metadata.gz: b43241f23f222376f99df65b0584ef0eb6d7490a2c2f0c41411f0abe2a347b41
+  data.tar.gz: 36585ccfc6a5270eacab88728d04ff8dbbbae391dc9082cb9b73ab6b46e3976f
 SHA512:
-  metadata.gz: '09bdf3433f89b186b224aa8b33614f5a28f219198e611c4823272cd1da04752f887e2f7f2d3373bb2411af72c46411947bfc0094fb696cb1ae5626c9b5cdce42'
-  data.tar.gz: 1b66da20c59d9d2bdea94553e645929ecfa023fed7715ea33569f383c3f43bfa1ce0eda27c90d495f93c0478fdb2fd2bd026d5e170342e28a482f01613b38021
+  metadata.gz: 88f1acc5a41ebd711dce9cb21dd4b971ad653b7ec33eac25b9d69b6b81c7f0a6bc29b156c861993623de418a1eaaff865fdd99ab41f4044feed0cdf9f9290293
+  data.tar.gz: 50402622cf5948c50ca2d25a67953a8358ee44b2dae4b690151ad5ab2398498956008109150ab78d35314ef27683f9e997546631f167fce5541ba92fc30ae803

data/lib/gthc/olson/algorithm.rb

@@ -23,13 +23,14 @@ module Algorithm
       people, slots = Weight.weightBalance(people, slots)
 
       # Weight Contiguous - prioritize people to stay in the tent more time at once.
-      slots, scheduleGrid = Weight.weightContiguous(slots, scheduleGrid, people)
+      slots, scheduleGrid = Weight.weightContiguous(slots, scheduleGrid)
 
       # Weight Tough Time - prioritize time slots with few people available.
       slots = Weight.weightToughTime(slots, scheduleLength)
 
       # Sort by Weights
-      slots.sort_by { |a| -a.weight }
+      slots.sort! { |a, b|  b.weight <=> a.weight }
+      # pp slots
 
       # Update people, spreadsheet, and remove slots.
       people, slots, graveyard, scheduleGrid = Weight.weightPick(people, slots, graveyard, scheduleGrid)

data/lib/gthc/olson/weight.rb

@@ -22,20 +22,16 @@ module Weight
       nightScheduled = people[currentPersonID].nightScheduled
       night = currentSlot.isNight;
 
-      nightMulti = 0;
-      dayMulti = 0;
+      nightMulti = 1;
+      dayMulti = 1;
 
       # Set multipliers.
       if nightScheduled != 0
-        nightMulti = 1.0 / nightScheduled
-      else
-        nightMulti = 1.5
+        nightMulti = 1.0 / (nightScheduled + 1)
       end
 
       if dayScheduled != 0
-        dayMulti = (1.0/(dayScheduled+nightScheduled*4*2))
-      else
-        dayMulti = 1.5
+        dayMulti = 1.0 / (dayScheduled + 1)
       end
 
       #Adjust weights with multipliers.
@@ -55,7 +51,7 @@ module Weight
   end
 
   # Weight Contiguous - prioritize people to stay in the tent more time at once.
-  def self.weightContiguous(slots, scheduleGrid, people)
+  def self.weightContiguous(slots, scheduleGrid)
 
     i = 0
     while i < slots.length
@@ -94,9 +90,7 @@ module Weight
 
       # Both are not free
       if !belowTent && !belowFree && !aboveSome && !belowSome && !aboveTent && !aboveFree
-        if slots[i].weight > 0
-          multi = -1
-        end
+        multi *= 0.25
       end
 
       # Above is scheduled, below is free.
@@ -140,18 +134,10 @@ module Weight
       end
 
       # Occurance of Somewhat Available
-      if aboveSome || belowSome
+      if slots[i].status == "Somewhat"
         multi *= 0.5
       end
 
-      # multi based on person
-      person = people[slots[i].col]
-      if slots[i].isNight && person.nightScheduled > 0
-        multi *= (1/person.nightScheduled)
-      elsif person.dayScheduled > 0
-        multi *= (1/person.dayScheduled)
-      end
-
       slots[i].weight = slots[i].weight*multi
       i += 1
 

data/lib/gthc/version.rb

@@ -1,3 +1,3 @@
 module GTHC
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gthc
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Aman Ibrahim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2019-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler