gthc 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b98b50a6ca98e477b3cd97aa98606246e4935394be67c9be2e34472a86be78c
-  data.tar.gz: 8103fd914dba2b063cff762494f413d126ba3f89e4a82dfcf6193be18f6c8188
+  metadata.gz: 4f0e60cb65325e46bc4a3c6be6c4d92ea768f5fa8b3cf6d70a0739bee0973d6c
+  data.tar.gz: 3eb17cd0752508ff4569653d4b47ad3a2c99c9136813cf310e4d25c1bdb5ba64
 SHA512:
-  metadata.gz: '091ca94de8f8e7cca4ede54545becac9a94119f2022ec8921f99e87fbd38ad1e4f85d666e23456cd05640c6046fd8af3bbbc1561b94a343f55f384ed9dc74304'
-  data.tar.gz: 2ed32919986167cb101aa9a99108382ba2c7e3800aeb2bc04c9ee153f63246ad31fee02191a15003ac51cf532ee668f11d2f777feb1cf90406b54b249aa3c223
+  metadata.gz: 526d67d650f2af010a6f4dd1c28c74e4c35cb29f7d35d4b4e530656d96c85397ba12327a0758dc8c8153fd4119a9f88af5c3e6eabc275b281b99958990bfdf69
+  data.tar.gz: 69d6cf457fd5c4bfe144a74367d856b986e32e8785ef9aa5a55cec10cfcf901dd57f12379f4397fbc202796d87fa0444a6aa3c5a26471c5c4181291e20ef26f3

data/lib/gthc/olson/algorithm.rb

@@ -140,9 +140,39 @@ module Algorithm
     combinedGrid.each do | slot |
       peopleNeeded = Helpers.calculatePeopleNeeded slot[:isNight], slot[:phase]
       peopleLeft = peopleNeeded - slot[:ids].length
-      slot["peopleLeft"] = peopleLeft
+      slot[:peopleLeft] = peopleLeft
     end
 
-    combinedGrid
+    return combinedGrid, simplifyGrid(combinedGrid)
   end
+
+  def simplifyGrid(combinedGrid)
+    simplifiedGrid = []
+    currentSlot = {}
+    building = false
+    combinedGrid.each_with_index do |slot, index|
+      if building
+        #if a slot has already started building
+        if isConnectedSlot(currentSlot, slot)
+          currentSlot[:endDate] = slot[:endDate]
+          #if any of the slots are night, all are marked as night
+          currentSlot[:isNight] = true if slot[:isNight]
+        else
+          simplifiedGrid.push currentSlot
+          currentSlot = slot
+        end
+      else
+        # if are starting a new slot
+        currentSlot = slot
+        building = true
+      end
+      simplifiedGrid.push currentSlot if index == combinedGrid.length - 1
+    end
+    simplifiedGrid
+  end
+
+  def isConnectedSlot(slot1, slot2)
+    slot1[:ids] == slot2[:ids] and slot1[:phase] == slot2[:phase]
+  end
+
 end

data/lib/gthc/version.rb

@@ -1,3 +1,3 @@
 module GTHC
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

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