gthc 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcebf62fac658df3fa6036907c8521606996b282f20be727dbe7672089605d94
-  data.tar.gz: 33b3003c98eca4dc25e7632e0ab03600a26c38d256043a2bf7fbe1c4b5598858
+  metadata.gz: a2e103bce21ce82dd8082748418964a84adbd9fbe63463f9367d15ca5569a836
+  data.tar.gz: 02ed1d95f8e4e6b4214c08e974cf3fbc6289a9bb4f36eea8397fe697f08bcb87
 SHA512:
-  metadata.gz: 8c5aa1eb665381bbfb66924e0c3f217250a841e68fb54841fd374bf67222e3fba31deec1a5cb18fb5e7270b4773722a1a6fe4d7c817666517da83a898644ffe2
-  data.tar.gz: dd1e5142b8e1ca81dc2d0e33538849737bb7ba186ea275377b9b4f0020e17a73a2f374b54f76d5d8ba968324983ace3cdcbe0f4889747b2b54986ecfea476484
+  metadata.gz: 1ffd8db92c841b2402a4f798d04b45d7d0a65de10ba60ce8809b1e6e55add6a1d6266602baaa2e2b637f59a35f09064a241690bc2179b934905b17e0e17a926f
+  data.tar.gz: 8bec0fc03302185d5b09ff08809497e880fcf89d9e4d1050517222dc730b941a584ab9ff18ac28c1a14372f1f8ec182fb1e1c1c9c07f61a0397c89c179d58fe7

data/lib/gthc/olson/algorithm.rb

@@ -23,7 +23,7 @@ module Algorithm
       people, slots = Weight.weightBalance(people, slots)
 
       # Weight Contiguous - prioritize people to stay in the tent more time at once.
-      slots, scheduleGrid, graveyard = Weight.weightContiguous(slots, scheduleGrid, graveyard)
+      slots, scheduleGrid = Weight.weightContiguous(slots, scheduleGrid, people)
 
       # Weight Tough Time - prioritize time slots with few people available.
       slots = Weight.weightToughTime(slots, scheduleLength)

data/lib/gthc/olson/weight.rb

@@ -55,7 +55,7 @@ module Weight
   end
 
   # Weight Contiguous - prioritize people to stay in the tent more time at once.
-  def self.weightContiguous(slots, scheduleGrid, graveyard)
+  def self.weightContiguous(slots, scheduleGrid, people)
 
     i = 0
     while i < slots.length
@@ -144,12 +144,20 @@ module Weight
         multi *= 0.5
       end
 
+      # multi based on person
+      person = people[slots[i].personID]
+      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
 
     end
 
-    return slots, scheduleGrid, graveyard
+    return slots, scheduleGrid
   end
 
   # Weight Tough Time - prioritize time slots with few people available. */

data/lib/gthc/version.rb

@@ -1,3 +1,3 @@
 module GTHC
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

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