excel_to_code 0.1.1 → 0.1.2

data/src/commands/excel_to_c.rb

@@ -105,6 +105,7 @@ class ExcelToC < ExcelToX
     c = CompileToC.new
     c.variable_set_counter = variable_set_counter
     c.gettable = lambda { |ref| false }
+    c.worksheet = ""
     i = input("Common elements")
     c.rewrite(i,w,o)
     close(i)

data/src/commands/excel_to_x.rb

@@ -173,10 +173,21 @@ class ExcelToX
     inline_formulae_that_are_only_used_once
     separate_formulae_elements
     replace_values_with_constants
-        
+
     # This actually creates the code (implemented in subclasses)
     write_code
     
+    # clear some memory here, before trying to compile
+    if run_in_memory
+      @files = nil
+      @cells_to_keep = nil
+      @cells_that_can_be_set_at_runtime = nil
+      # now do garbage collection, because what we've just done will have freed a lot of memory
+      GC.enable
+      GC.start
+      # TODO I think there's still another 500MB that could be freed here, when compiling decc_model
+    end
+        
     # These compile and run the code version of the excel (implemented in subclasses)
     compile_code
     run_tests

data/src/compile/c/compile_to_c.rb

@@ -18,7 +18,7 @@ class CompileToC
     mapper = MapFormulaeToC.new
     mapper.worksheet = worksheet
     mapper.sheet_names = Hash[sheet_names_file.readlines.map { |line| line.strip.split("\t")}]
-    c_name = mapper.sheet_names[worksheet]
+    c_name = mapper.sheet_names[worksheet] || worksheet
     input.lines do |line|
       begin
         ref, formula = line.split("\t")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg