Merge pull request #61 from quintel/built-environment-heat

Heat modelling changes for the built environment

.semaphore/semaphore.yml

@@ -7,13 +7,15 @@ agent:
 blocks:
   - name: RSpec
     task:
+      prologue:
+        commands:
+          - checkout
+          - cache restore
+          - bundle install
+          - cache store
       jobs:
         - name: Test
           commands:
-            - checkout
-            - cache restore
-            - bundle install
-            - cache store
             - bundle exec rspec
           matrix:
             - env_var: RUBY_VERSION

lib/refinery/calculators/base.rb

@@ -15,6 +15,7 @@ class Base
       # Public: The object which the calculator calculates.
       attr_reader :model
 
+
       # Public: Creates a new calculator responsible for figuring out the
       # unknown attributes for the given +model+. Calculator is a base class
       # and should be extended with the logic needed to compute the values.
@@ -58,6 +59,12 @@ def calculated?
         @calculated
       end
 
+      # Public: Returns true if the calculation of this part of the graph is
+      # paused
+      def paused?
+        @model.wait?
+      end
+
       # Public: A human-readable version of the calculator for debugging.
       #
       # Returns a string.

lib/refinery/catalyst/calculators.rb

@@ -95,7 +95,7 @@ def calculate(calculator, order)
       def uncalculated
         @graph.tsort { |e| e.get(:type) != :overflow }.map do |node|
           [ node.calculator, *node.out_edges.map(&:calculator).to_a ]
-        end.flatten.reject(&:calculated?).reverse
+        end.flatten.reject(&:calculated?).reject(&:paused?).reverse
       end
     end
   end

lib/refinery/edge.rb

@@ -21,6 +21,18 @@ def demand
       get(:demand)
     end
 
+    def wait?
+      @paused || false
+    end
+
+    def wait!
+      @paused = true
+    end
+
+    def continue!
+      @paused = false
+    end
+
     def inspect
       super.sub(/>$/, " (type=#{get(:type)})>")
     end

lib/refinery/node.rb

@@ -36,6 +36,18 @@ def demand
       get(:demand)
     end
 
+    def wait?
+      @paused || false
+    end
+
+    def wait!
+      @paused = true
+    end
+
+    def continue!
+      @paused = false
+    end
+
     # Public: The demand of the node for a given +carrier+.
     #
     # If the node demands a total of 200 energy, and its incoming gas slot has