excel_to_code 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0663c5e494db3faed27a118aa4cce8b2b5095655
-  data.tar.gz: 0aab1b24a30a1cea9a91ebdc0fed82f84bc3ec59
+  metadata.gz: 9a337c16718282fa8bbce1da4a51cb81d2ad6651
+  data.tar.gz: fbfa6de417b5b4f8fe626244b234876cd00f430c
 SHA512:
-  metadata.gz: 401103eb0a1c639486412b7c735d322bbb060ddb1ebdc83d973a810e330e1e412070dd4b96f423ab9b5502c1ba2eb02ba73f19634fe4a176a443243d3802a66b
-  data.tar.gz: c746f24035da13f0e34581b48df68ae7fe7f4ddb2ccae54a320692a729cf8c0ae0cf9cc95a89ba5cfd98bba5f0e26aa8a8acbf8f474a21e963a111fa858932e3
+  metadata.gz: cf150004e0ad6ad4cf8d17d4abc740c4b5e33e3224c39091a2d9b9edc65d4e66de2ba047446c9cbc04fe7c33f680ed156300dc10ca568f38e7c6e97a70896a7e
+  data.tar.gz: 28bbe1191e5da2bbcbc63d4bda866f6f1720c619212659d6aeaece6c9e21baa7597b95ec7e6d77718895ff9bed54f9cc07c4cd5674a8918fb73874ebfbd12044

data/README.md

@@ -48,3 +48,4 @@ There are some how to guides in the doc folder.
 7. Newlines are removed from strings
 8. The generated code uses floating point, rather than fully precise arithmetic, so results can differ slightly
 9. The generated code uses the sprintf approach to rounding (even-odd) rather than excel's 0.5 rounds away from zero.
+10. Ranges like this: Sheet1!A10:Sheet1!B20 and 3D ranges don't work

data/src/commands/excel_to_c.rb

@@ -380,9 +380,8 @@ END
     return unless actually_compile_code || actually_run_tests
     name = output_name.downcase
     log.info "Compiling"
-    puts `cd #{output_directory}`
-    puts `gcc -fPIC -o #{name}.o -c #{name}.c`
-    puts `gcc -shared -fPIC -o #{FFI.map_library_name(name)} #{name}.o`
+    puts `gcc -fPIC -o #{File.join(output_directory, name)}.o -c #{File.join(output_directory, name)}.c`
+    puts `gcc -shared -fPIC -o #{File.join(output_directory, FFI.map_library_name(name))} #{File.join(output_directory, name)}.o`
   end
   
   def run_tests

data/src/commands/excel_to_x.rb

@@ -142,6 +142,7 @@ class ExcelToX
     # format and refer to sheets and references that actually exist
     clean_cells_that_can_be_set_at_runtime
     clean_cells_to_keep
+    convert_named_references_into_simple_form
     clean_named_references_to_keep
     clean_named_references_that_can_be_set_at_runtime
 
@@ -308,11 +309,22 @@ class ExcelToX
         raise
       end
     end
+
+  end
+
+  # Named references can be simple cell references, 
+  # or they can be ranges, or errors, or table references
+  # this function converts all the different types into
+  # arrays of cell references
+  def convert_named_references_into_simple_form
     # Replace A$1:B2 with [A1, A2, B1, B2]
     @replace_ranges_with_array_literals_replacer ||= ReplaceRangesWithArrayLiteralsAst.new
+    table_reference_replacer = ReplaceTableReferenceAst.new(@tables)
 
     @named_references.each do |name, reference|
-      @named_references[name] = @replace_ranges_with_array_literals_replacer.map(reference)
+      reference = table_reference_replacer.map(reference)
+      reference = @replace_ranges_with_array_literals_replacer.map(reference)
+      @named_references[name] = reference
     end
 
   end

data/src/compile/c/excel_to_c_runtime.c

@@ -83,6 +83,7 @@ static ExcelValue min(int number_of_arguments, ExcelValue *arguments);
 static ExcelValue mmult(ExcelValue a_v, ExcelValue b_v);
 static ExcelValue mod(ExcelValue a_v, ExcelValue b_v);
 static ExcelValue negative(ExcelValue a_v);
+static ExcelValue npv(ExcelValue rate, int number_of_arguments, ExcelValue *arguments);
 static ExcelValue pmt(ExcelValue rate_v, ExcelValue number_of_periods_v, ExcelValue present_value_v);
 static ExcelValue power(ExcelValue a_v, ExcelValue b_v);
 static ExcelValue pv_3(ExcelValue a_v, ExcelValue b_v, ExcelValue c_v);
@@ -1310,6 +1311,44 @@ static ExcelValue sum(int array_size, ExcelValue *array) {
 	return new_excel_number(total);
 }
 
+static ExcelValue npv(ExcelValue rate_v, int number_of_arguments, ExcelValue *arguments) {
+	CHECK_FOR_PASSED_ERROR(rate_v)
+	NUMBER(rate_v, rate)
+	CHECK_FOR_CONVERSION_ERROR
+  if(rate == -1) { return DIV0; }
+
+  double npv = 0;
+  int n = 1;
+  int i;
+  int j;
+  double v;
+  ExcelValue r;
+  ExcelValue r2;
+  ExcelValue *range;
+
+  for(i=0;i<number_of_arguments;i++) {
+    r = arguments[i];
+    if(r.type == ExcelError) { return r; }
+    if(r.type == ExcelRange) {
+      range = r.array;
+      for(j=0;j<(r.columns*r.rows);j++) {
+        r2 = range[j];
+        if(r2.type == ExcelError) { return r2; }
+        v = number_from(r2);
+        if(conversion_error) { conversion_error = 0; return VALUE; }
+        npv = npv + (v/pow(1+rate, n));
+        n++;
+      }
+    } else {
+      v = number_from(r);
+      if(conversion_error) { conversion_error = 0; return VALUE; }
+      npv = npv + (v/pow(1+rate, n));
+      n++;
+    }
+  }
+  return new_excel_number(npv);
+}
+
 static ExcelValue max(int number_of_arguments, ExcelValue *arguments) {
 	double biggest_number_found;
 	int any_number_found = 0;

data/src/compile/c/excel_to_c_runtime_test.c

@@ -959,6 +959,27 @@ int test_functions() {
   assert(value(new_excel_string("1")).number == 1);
   assert(value(new_excel_string("A1A")).type == ExcelError);
 
+
+  // NPV(rate, flow1, flow2)
+  ExcelValue npv_array1[] = { new_excel_number(110) };
+  assert(npv(new_excel_number(0.1), 1, npv_array1).type == ExcelNumber);
+  assert(npv(new_excel_number(0.1), 1, npv_array1).number-100 < 0.001);
+
+  ExcelValue npv_array2[] = { new_excel_number(110), new_excel_number(121) };
+  assert((npv(new_excel_number(0.1), 2, npv_array2).number - 200) < 0.001);
+
+  ExcelValue npv_array3[] = { new_excel_number(110), new_excel_number(121)};
+  ExcelValue npv_array3_v = new_excel_range(npv_array3,2,1);
+  ExcelValue npv_array4[] = { npv_array3_v };
+
+  assert((npv(new_excel_number(0.1), 1,  npv_array4).number - 200) < 0.001);
+
+  assert(npv(new_excel_number(-1.0), 1, npv_array1).type == ExcelError);
+  assert(npv(BLANK, 1, npv_array1).number == 110);
+
+  ExcelValue npv_array5[] = { BLANK };
+  assert(npv(new_excel_number(0.1), 1, npv_array5).number == 0);
+
   // Release memory
   free_all_allocated_memory();
 

data/src/compile/c/map_formulae_to_c.rb

@@ -66,6 +66,7 @@ class MapFormulaeToC < MapValuesToC
     :'MIN' => 'min',
     :'MMULT' => 'mmult',
     :'MOD' => 'mod',
+    :'NPV' => 'npv',
     :'PMT' => 'pmt',
     :'PV3' => 'pv_3',
     :'PV4' => 'pv_4',
@@ -156,6 +157,10 @@ class MapFormulaeToC < MapValuesToC
     "#{FUNCTIONS[:AVERAGEIFS]}(#{map(average_range)}, #{map_arguments_to_array(criteria)})"
   end
 
+  def function_npv(rate,*cash_flows)
+    "#{FUNCTIONS[:NPV]}(#{map(rate)}, #{map_arguments_to_array(cash_flows)})"
+  end
+
   def function_if(condition, true_case, false_case = [:boolean_false])
     true_code = map(true_case)
     false_code = map(false_case)

data/src/compile/ruby/map_formulae_to_ruby.rb

@@ -51,6 +51,7 @@ class MapFormulaeToRuby < MapValuesToRuby
     :'MIN' => 'min',
     :'MMULT' => 'mmult',
     :'MOD' => 'mod',
+    :'NPV' => 'npv',
     :'PI' => 'pi',
     :'PMT' => 'pmt',
     :'POWER' => 'power',

data/src/excel/excel_functions.rb

@@ -113,3 +113,5 @@ require_relative 'excel_functions/value'
 require_relative 'excel_functions/ln'
 
 require_relative 'excel_functions/iserr'
+
+require_relative 'excel_functions/npv'

data/src/excel/excel_functions/npv.rb

@@ -0,0 +1,20 @@
+module ExcelFunctions
+  
+  def npv(rate, *values)
+    # Turn the arguments into numbers
+    rate = number_argument(rate)
+    values = values.flatten.map { |v| number_argument(v) }
+
+    # Check for errors
+    return rate if rate.is_a?(Symbol)
+    return :div0 if rate == -1
+    values.each { |v| return v if v.is_a?(Symbol) }
+
+    npv = 0
+
+    values.each.with_index { |v, i| npv = npv + (v/((1+rate)**(i+1))) }
+
+    npv
+  end
+  
+end

data/src/excel_to_code.rb

@@ -1,5 +1,5 @@
 class ExcelToCode
-  def self.version() "0.3.3" end
+  def self.version() "0.3.4" end
 end
 
 require_relative 'commands'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -105,7 +105,8 @@ description: "# excel_to_code\n\nConverts some excel spreadsheets (.xlsx, not .x
   multithread and will give bad results if you try\n7. Newlines are removed from strings\n8.
   The generated code uses floating point, rather than fully precise arithmetic, so
   results can differ slightly\n9. The generated code uses the sprintf approach to
-  rounding (even-odd) rather than excel's 0.5 rounds away from zero.\n"
+  rounding (even-odd) rather than excel's 0.5 rounds away from zero.\n10. Ranges like
+  this: Sheet1!A10:Sheet1!B20 and 3D ranges don't work\n"
 email: tamc@greenonblack.com
 executables:
 - excel_to_c
@@ -189,6 +190,7 @@ files:
 - src/excel/excel_functions/multiply.rb
 - src/excel/excel_functions/negative.rb
 - src/excel/excel_functions/not_equal.rb
+- src/excel/excel_functions/npv.rb
 - src/excel/excel_functions/number_argument.rb
 - src/excel/excel_functions/pi.rb
 - src/excel/excel_functions/pmt.rb