decc_2050_model 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b26eec4356370d26fbb5ff2136b28a226d0b85f
-  data.tar.gz: 4a63fa30a1af05d173ffddb9678824b698fb273e
+  metadata.gz: a61c1668f61f916a1a6f625d1222af61b07f9681
+  data.tar.gz: 232abaecae5eae78d80c8a4c2d99f6e16eefd2a8
 SHA512:
-  metadata.gz: d2133d957825d1f5212b95a6eef40841ce127ea1edca9d13483312c9add3b31cec7fd36612b1e386e23469099d9ce99c3f593de742ac6a23d9a5b8cfbd05f66b
-  data.tar.gz: 7a54468cdb811056f686a810d0f3127c9ff77f2348222c77dedb81c127f2916ad207989bf5ee2b006c4226ff4198ca0b16116f7fe04b526fd78b93e36c0e6ce0
+  metadata.gz: b1c32da0e29f3994976ae1fba5fb6768ad87e5d07e52c16ec75f9f92096a907183954a26400ee46e4785d53b4ba5963b41c864a1a187cc2999c4e230ad3d85aa
+  data.tar.gz: e42a747d886b7f24435d48cff62cc3803d85245daea2beb12edd43c7391db7e96c6b7cb66602114a58b5546187fc967d37fbf087cb27ee6ddc22341da93d7fd8

data/README.markdown

@@ -30,19 +30,19 @@ First of all, you need to be working on the github version of the code, not the
     
     git clone http://github.com/decc/decc_2050_model
 
-Then put the new spreadsheet in spreadsheet/2050Model.xlsx
+Then put the new spreadsheet in spreadsheet/model.xlsx
 
 Then, from the top directory of the gem:
   
     bundle
     bundle exec rake
   
-The next step is to check whether Rakefile, lib/decc_2050_model/decc_2050_model_result.rb and lib/decc_2050_model/model_structure.rb need to be altered so that they
+The next step is to check whether Rakefile, lib/model/_model_result.rb and lib/model/model_structure.rb need to be altered so that they
 pick up the correct places in the underlying excel.
   
 The final stage is to build and install the new gem:
     
-    gem build decc_2050_model.gemspec
+    gem build model.gemspec
     gem install decc_2050_model-<version>.gem 
 
 ... where <version> is the version number of the gem file that was created in the folder.

data/ext/Rakefile

@@ -6,10 +6,10 @@ COMPILER = "gcc"
 COMPILE_FLAGS = "-fPIC"
 SHARED_LIBRARY_FLAGS = "-shared -fPIC"
 
-OUTPUT = FFI.map_library_name "decc_2050_model"
-OUTPUT_DIR = "../lib/decc_2050_model/"
-SOURCE = "decc_2050_model.c"
-OBJECT = "decc_2050_model.o"
+OUTPUT = FFI.map_library_name "model"
+OUTPUT_DIR = "../lib/model/"
+SOURCE = "model.c"
+OBJECT = "model.o"
 
 task :default => [:build]
 
@@ -26,4 +26,4 @@ file OBJECT => SOURCE do
   puts "Building #{SOURCE}"
   puts "Note that this is a really large c file, it may take tens of minutes to compile."
   sh "#{COMPILER} #{COMPILE_FLAGS} -o #{OBJECT} -c #{SOURCE}"
-end
+end

data/ext/{decc_2050_model.c → model.c}

@@ -1,4 +1,4 @@
-// /Users/tamc/Documents/2050/decc_2050_model/spreadsheet/2050Model.xlsx approximately translated into C
+// /Users/tamc/Documents/2050/decc_2050_model/spreadsheet/model.xlsx approximately translated into C
 // First we have c versions of all the excel functions that we know
 #include <stdio.h>
 #include <assert.h>
@@ -62,6 +62,7 @@ static ExcelValue hlookup(ExcelValue lookup_value_v,ExcelValue lookup_table_v, E
 static ExcelValue iferror(ExcelValue value, ExcelValue value_if_error);
 static ExcelValue excel_index(ExcelValue array_v, ExcelValue row_number_v, ExcelValue column_number_v);
 static ExcelValue excel_index_2(ExcelValue array_v, ExcelValue row_number_v);
+static ExcelValue excel_isnumber(ExcelValue number);
 static ExcelValue large(ExcelValue array_v, ExcelValue k_v);
 static ExcelValue left(ExcelValue string_v, ExcelValue number_of_characters_v);
 static ExcelValue left_1(ExcelValue string_v);
@@ -505,6 +506,14 @@ static ExcelValue not_equal(ExcelValue a_v, ExcelValue b_v) {
 	return result;
 }
 
+static ExcelValue excel_isnumber(ExcelValue potential_number) {
+  if(potential_number.type == ExcelNumber) {
+    return TRUE;
+  } else {
+    return FALSE;
+  }
+}
+
 static ExcelValue excel_if(ExcelValue condition, ExcelValue true_case, ExcelValue false_case ) {
 	CHECK_FOR_PASSED_ERROR(condition)
 	
@@ -2590,6 +2599,15 @@ int test_functions() {
   assert(rank(THREE, rank_2_v, ZERO).type == ExcelError);
 
 
+  // Test the ISNUMBER function
+  assert(excel_isnumber(ONE).type == ExcelBoolean);
+  assert(excel_isnumber(ONE).number == 1);
+  assert(excel_isnumber(BLANK).type == ExcelBoolean);
+  assert(excel_isnumber(BLANK).number == 0);
+  assert(excel_isnumber(new_excel_string("Hello")).type == ExcelBoolean);
+  assert(excel_isnumber(new_excel_string("Hello")).number == 0);
+  assert(excel_isnumber(TRUE).type == ExcelBoolean);
+  assert(excel_isnumber(TRUE).number == 0);
 
   // Release memory
   free_all_allocated_memory();
@@ -2605,7 +2623,7 @@ int main() {
 // Start of the file specific functions
 
 // definitions
-static ExcelValue ORIGINAL_EXCEL_FILENAME = {.type = ExcelString, .string = "/Users/tamc/Documents/2050/decc_2050_model/spreadsheet/2050Model.xlsx" };
+static ExcelValue ORIGINAL_EXCEL_FILENAME = {.type = ExcelString, .string = "/Users/tamc/Documents/2050/decc_2050_model/spreadsheet/model.xlsx" };
 static ExcelValue _common0();
 static ExcelValue _common1();
 static ExcelValue _common2();
@@ -65187,7 +65205,7 @@ void reset() {
 };
 
 // starting the value constants
-static ExcelValue C1 = {.type = ExcelString, .string = "Version 3.5.0"};
+static ExcelValue C1 = {.type = ExcelString, .string = "Version 3.5.1"};
 static ExcelValue C2 = {.type = ExcelString, .string = "Doesn't tackle climate change (All at level 1)"};
 static ExcelValue C3 = {.type = ExcelString, .string = "Maximium demand, no supply"};
 static ExcelValue C4 = {.type = ExcelString, .string = "Maximum supply, no demand"};
@@ -211269,7 +211287,7 @@ void set_control_e32(ExcelValue newValue) { variable_set[6276] = 1; control_e32_
 ExcelValue control_f32() {
   static ExcelValue result;
   if(variable_set[6277] == 1) { return result;}
-  result = C16;
+  result = C46;
   variable_set[6277] = 1;
   return result;
 }

data/lib/decc_2050_model.rb

@@ -1,7 +1,6 @@
-require_relative "decc_2050_model/decc_2050_model"
-require_relative "decc_2050_model/decc_2050_model_utilities"
-require_relative "decc_2050_model/decc_2050_model_result"
-require_relative "decc_2050_model/model_structure"
-require_relative "decc_2050_model/model_choice"
-require_relative "decc_2050_model/model_alternative"
-require_relative "decc_2050_model/decc_2050_model_version"
+require_relative 'model'
+
+Decc2050Model = Model
+Decc2050ModelShim = ModelShim
+Decc2050ModelResult = ModelResult
+

data/lib/model.rb

@@ -0,0 +1,7 @@
+require_relative "model/model"
+require_relative "model/model_utilities"
+require_relative "model/model_result"
+require_relative "model/model_structure"
+require_relative "model/model_choice"
+require_relative "model/model_alternative"
+require_relative "model/model_version"

data/lib/{decc_2050_model/decc_2050_model.rb → model/model.rb}

@@ -1,7 +1,7 @@
 require 'ffi'
 require 'singleton'
 
-class Decc2050ModelShim
+class ModelShim
 
   # WARNING: this is not thread safe
   def initialize
@@ -9,7 +9,7 @@ class Decc2050ModelShim
   end
 
   def reset
-    Decc2050Model.reset
+    Model.reset
   end
 
   def method_missing(name, *arguments)
@@ -23,8 +23,8 @@ class Decc2050ModelShim
   end
 
   def get(name)
-    return 0 unless Decc2050Model.respond_to?(name)
-    ruby_value_from_excel_value(Decc2050Model.send(name))
+    return 0 unless Model.respond_to?(name)
+    ruby_value_from_excel_value(Model.send(name))
   end
 
   def ruby_value_from_excel_value(excel_value)
@@ -37,11 +37,11 @@ class Decc2050ModelShim
       r = excel_value[:rows]
       c = excel_value[:columns]
       p = excel_value[:array]
-      s = Decc2050Model::ExcelValue.size
+      s = Model::ExcelValue.size
       a = Array.new(r) { Array.new(c) }
       (0...r).each do |row|
         (0...c).each do |column|
-          a[row][column] = ruby_value_from_excel_value(Decc2050Model::ExcelValue.new(p + (((row*c)+column)*s)))
+          a[row][column] = ruby_value_from_excel_value(Model::ExcelValue.new(p + (((row*c)+column)*s)))
         end
       end 
       return a
@@ -54,11 +54,11 @@ class Decc2050ModelShim
   def set(name, ruby_value)
     name = name.to_s
     name = "set_#{name[0..-2]}" if name.end_with?('=')
-    return false unless Decc2050Model.respond_to?(name)
-    Decc2050Model.send(name, excel_value_from_ruby_value(ruby_value))
+    return false unless Model.respond_to?(name)
+    Model.send(name, excel_value_from_ruby_value(ruby_value))
   end
 
-  def excel_value_from_ruby_value(ruby_value, excel_value = Decc2050Model::ExcelValue.new)
+  def excel_value_from_ruby_value(ruby_value, excel_value = Model::ExcelValue.new)
     case ruby_value
     when Numeric
       excel_value[:type] = :ExcelNumber
@@ -82,10 +82,10 @@ class Decc2050ModelShim
         excel_value[:columns] = ruby_value.size
       end
       ruby_values = ruby_value.flatten
-      pointer = FFI::MemoryPointer.new(Decc2050Model::ExcelValue, ruby_values.size)
+      pointer = FFI::MemoryPointer.new(Model::ExcelValue, ruby_values.size)
       excel_value[:array] = pointer
       ruby_values.each.with_index do |v,i|
-        excel_value_from_ruby_value(v, Decc2050Model::ExcelValue.new(pointer[i]))
+        excel_value_from_ruby_value(v, Model::ExcelValue.new(pointer[i]))
       end
     when Symbol
       excel_value[:type] = :ExcelError
@@ -99,9 +99,9 @@ class Decc2050ModelShim
 end
     
 
-module Decc2050Model
+module Model
   extend FFI::Library
-  ffi_lib  File.join(File.dirname(__FILE__),FFI.map_library_name('decc_2050_model'))
+  ffi_lib  File.join(File.dirname(__FILE__),FFI.map_library_name('model'))
   ExcelType = enum :ExcelEmpty, :ExcelNumber, :ExcelString, :ExcelBoolean, :ExcelError, :ExcelRange
                 
   class ExcelValue < FFI::Struct

data/lib/{decc_2050_model/decc_2050_model_result.rb → model/model_result.rb}

@@ -1,10 +1,10 @@
-require_relative '../decc_2050_model'
+require_relative '../model'
 
-class Decc2050ModelResult < Decc2050ModelUtilities  
+class ModelResult < ModelUtilities  
   attr_accessor :excel, :pathway
   
   def initialize
-    @excel = Decc2050ModelShim.new
+    @excel = ModelShim.new
   end
   
   def self.calculate_pathway(code)
@@ -210,13 +210,13 @@ class Decc2050ModelResult < Decc2050ModelUtilities
 end
 
 if __FILE__ == $0
-  g = Decc2050ModelResult.new
+  g = ModelResult.new
 
   tests = 100
   t = Time.now
   a = []
   tests.times do
-    a << g.calculate_pathway(Decc2050ModelResult::CONTROL.map { rand(4)+1 }.join)
+    a << g.calculate_pathway(ModelResult::CONTROL.map { rand(4)+1 }.join)
   end
   te = Time.now - t
   puts "#{te/tests} seconds per run"

data/lib/{decc_2050_model → model}/model_structure.rb

@@ -1,13 +1,13 @@
-require_relative 'decc_2050_model'
+require_relative 'model'
 require 'singleton'
 
-class ModelStructure < Decc2050ModelUtilities
+class ModelStructure < ModelUtilities
   include Singleton
   
   attr_accessor :excel, :choices
     
   def initialize
-    @excel = Decc2050ModelShim.new
+    @excel = ModelShim.new
     @choices = []
     types.each_with_index do |choice_type,i|
       case choice_type

data/lib/{decc_2050_model/decc_2050_model_utilities.rb → model/model_utilities.rb}

@@ -1,4 +1,4 @@
-class Decc2050ModelUtilities
+class ModelUtilities
   # Set the 9 decimal points between 1.1 and 3.9
   FLOAT_TO_LETTER_MAP = Hash["abcdefghijklmnopqrstuvwxyzABCD".split('').map.with_index { |l,i| [(i/10.0)+1,l] }]
   FLOAT_TO_LETTER_MAP[0.0] = '0'

data/lib/model/model_version.rb

@@ -0,0 +1 @@
+def Model.last_modified_date() @last_modified_date ||= Time.utc(*[55, 52, 11, 27, 11, 2013, 3, 331, false, "GMT"]); end

data/test/{create_decc_2050_model_result.rb → create_model_result.rb}

@@ -1,15 +1,15 @@
 # coding: utf-8
-# Create a test for decc_2050_model_result
-require_relative '../lib/decc_2050_model'
+# Create a test for model_result
+require_relative '../lib/model'
 require 'pp'
 
 pathway = ARGV[0].strip
 tests_folder = File.join(File.dirname(__FILE__),"expected_results")
 
 puts "Creating a copy of the output for pathway #{pathway} and puting it in #{tests_folder}"
-puts "To compare future versions of the model with this test result, run test_decc_2050_model_result.rb"
+puts "To compare future versions of the model with this test result, run test_model_result.rb"
 
-model = Decc2050ModelResult.new
+model = ModelResult.new
 File.open(File.join(tests_folder,"#{pathway}.json"),'w') do |f|
   result = model.calculate_pathway(pathway).pretty_inspect
   f.puts pathway

data/test/{test_decc_2050_model.rb → test_model.rb}

@@ -1,18 +1,18 @@
 # coding: utf-8
-# Test for decc_2050_model
+# Test for model
 require 'rubygems'
 gem 'minitest'
 require 'minitest/autorun'
-require_relative '../lib/decc_2050_model'
+require_relative '../lib/model'
 
-class TestDecc2050Model < Minitest::Test
+class TestModel < Minitest::Test
   def self.runnable_methods
     puts 'Overriding minitest to run tests in a defined order'
     methods = methods_matching(/^test_/)
   end
   def worksheet; @worksheet ||= init_spreadsheet; end
-  def init_spreadsheet; Decc2050ModelShim.new end
-  def test_control_m1; assert_equal("Version 3.5.0", worksheet.control_m1); end
+  def init_spreadsheet; ModelShim.new end
+  def test_control_m1; assert_equal("Version 3.5.1", worksheet.control_m1); end
   def test_control_m4; assert_equal("Doesn't tackle climate change (All at level 1)", worksheet.control_m4); end
   def test_control_n4; assert_equal("Maximium demand, no supply", worksheet.control_n4); end
   def test_control_o4; assert_equal("Maximum supply, no demand", worksheet.control_o4); end
@@ -559,7 +559,7 @@ class TestDecc2050Model < Minitest::Test
   def test_control_bq31; assert_equal("By 2050, 20% conventional combustion engine cars, with 32% in plug-in hybrid vehicles and 48% in zero emission vehicles: 22% of bus travel fully electric or fuel cell electric ", worksheet.control_bq31); end
   def test_control_br31; assert_equal("By 2050 100%  electric motor or hydrogen fuel cell; all passenger trains electrified; 50% bus  electrified ", worksheet.control_br31); end
   def test_control_d32; assert_equal("Choice of fuel cells or batteries", worksheet.control_d32); end
-  def test_control_f32; assert_in_epsilon(4, worksheet.control_f32, 0.001); end
+  def test_control_f32; assert_equal("D", worksheet.control_f32); end
   def test_control_h32; assert_equal("100% of zero emission cars use batteries by 2050", worksheet.control_h32); end
   def test_control_i32; assert_equal("Among zero emission cars, 80% use batteries and 20% use fuel cells by 2050", worksheet.control_i32); end
   def test_control_j32; assert_equal("Among zero emission cars, 20% use batteries and 80% use fuel cells by 2050", worksheet.control_j32); end

data/test/{test_decc_2050_model_result.rb → test_model_result.rb}

@@ -1,15 +1,15 @@
 # coding: utf-8
-# Test for decc_2050_model_result
+# Test for model_result
 require 'rubygems'
 gem 'minitest'
 require 'test/unit'
-require_relative '../lib/decc_2050_model'
+require_relative '../lib/model'
 require 'pp'
 
-class TestDecc2050ModelResult < Test::Unit::TestCase
+class TestModelResult < Test::Unit::TestCase
 
   def test_results
-    @model = Decc2050ModelResult.new
+    @model = ModelResult.new
     tests_folder = File.join(File.dirname(__FILE__),"expected_results")
     Dir[File.join(tests_folder, "*.json")].each do |test|
       expected = IO.readlines(test)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decc_2050_model
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Thomas Counsell, Department of Energy and Climate Change, Her Majesty's Government,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -51,11 +51,11 @@ description: "# DECC 2050 CALCULATOR TOOL\n\nA C version and ruby wrapper for th
   10-20 minutes or so\n\n    gem install decc_2050_model\n  \n## UPDATING TO NEWER
   VERSIONS OF EXCEL MODEL\n\nFirst of all, you need to be working on the github version
   of the code, not the rubygem:\n    \n    git clone http://github.com/decc/decc_2050_model\n\nThen
-  put the new spreadsheet in spreadsheet/2050Model.xlsx\n\nThen, from the top directory
+  put the new spreadsheet in spreadsheet/model.xlsx\n\nThen, from the top directory
   of the gem:\n  \n    bundle\n    bundle exec rake\n  \nThe next step is to check
-  whether Rakefile, lib/decc_2050_model/decc_2050_model_result.rb and lib/decc_2050_model/model_structure.rb
-  need to be altered so that they\npick up the correct places in the underlying excel.\n
-  \ \nThe final stage is to build and install the new gem:\n    \n    gem build decc_2050_model.gemspec\n
+  whether Rakefile, lib/model/_model_result.rb and lib/model/model_structure.rb need
+  to be altered so that they\npick up the correct places in the underlying excel.\n
+  \ \nThe final stage is to build and install the new gem:\n    \n    gem build model.gemspec\n
   \   gem install decc_2050_model-<version>.gem \n\n... where <version> is the version
   number of the gem file that was created in the folder.\n  \nNow follow the instructions
   in the twenty-fifty server directory in order to ensure that it is using this new
@@ -67,24 +67,25 @@ extensions:
 extra_rdoc_files: []
 files:
 - README.markdown
-- lib/decc_2050_model/decc_2050_model.rb
-- lib/decc_2050_model/decc_2050_model_result.rb
-- lib/decc_2050_model/decc_2050_model_utilities.rb
-- lib/decc_2050_model/decc_2050_model_version.rb
-- lib/decc_2050_model/model_alternative.rb
-- lib/decc_2050_model/model_choice.rb
-- lib/decc_2050_model/model_structure.rb
 - lib/decc_2050_model.rb
-- ext/decc_2050_model.c
-- test/create_decc_2050_model_result.rb
+- lib/model/model.rb
+- lib/model/model_alternative.rb
+- lib/model/model_choice.rb
+- lib/model/model_result.rb
+- lib/model/model_structure.rb
+- lib/model/model_utilities.rb
+- lib/model/model_version.rb
+- lib/model.rb
+- ext/model.c
+- test/create_model_result.rb
 - test/expected_results/10111111111111110111111001111110111101101101110110111.json
 - test/expected_results/10111111111111110111111004444440444404203304440420111.json
 - test/expected_results/40444444444444440444444001111110111101101101110110441.json
 - test/expected_results/40444444444444440444444004444440444404203304440420441.json
 - test/expected_results/e0d3jrg221ci12110222112004423220444404202304440420141.json
 - test/expected_results/i0g2dd2pp1121f1i032211p004314110433304202304320420121.json
-- test/test_decc_2050_model.rb
-- test/test_decc_2050_model_result.rb
+- test/test_model.rb
+- test/test_model_result.rb
 - ext/Rakefile
 homepage: http://github.com/decc/decc_2050_model
 licenses:
@@ -111,3 +112,4 @@ signing_key:
 specification_version: 4
 summary: A C version of DECC's 2050 Pathway Excel Spreadsheet
 test_files: []
+has_rdoc: false

data/lib/decc_2050_model/decc_2050_model_version.rb

@@ -1 +0,0 @@
-def Decc2050Model.last_modified_date() @last_modified_date ||= Time.utc(*[10, 19, 11, 19, 11, 2013, 2, 323, false, "GMT"]); end