excel_to_code 0.1.18 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 941c09c8afeaa5e544a63fb1085365f8a4f7f992
-  data.tar.gz: d5a324022f70c5a83911b77a6ca059be3d738922
+  metadata.gz: dbfac77ee7c479c1e3608dac1dad7892a8156e92
+  data.tar.gz: f474343c232b69a7b91a05a51fad658253af9991
 SHA512:
-  metadata.gz: a5fd21e7c3779df389c0b876b0369ffdc486118081d1dc875bac7c325f5bab95a66f25989180cdadf67c3c9c5c652f5c3f527a474b6dbfc36b31b520f8a019c0
-  data.tar.gz: e45262481894791a2139ddb75cf9c961732401b433360d634063e6aafd87c792cb4fc18f034e8aaa12f0d19f9aae9a0e8630d1e845485fc4545302871d067323
+  metadata.gz: 20fe12e945146c0d0740e00b534a8474848231cf3d938f71a85fafff43ef977b233ba12cafc53d165a440ce0a3ed950d316ff70a53239af0a314ba1dace6884a
+  data.tar.gz: e6efe0d22d6f042633ea7885d83ba0319bcddda0ea00adb874784a8e05e7b90b115c6cd02c218b9d62960a99f3e0a9b6136054df623afddb048e123ebbb3e27d

data/TODO

@@ -25,5 +25,5 @@ See doc/How_to_add_a_missing_function.md
 * Rewrite the excel_to_ruby command to use command line options
 * Refactor excel_to_c_runtime - split the functions? split the tests?
 * Tool for turning spreadsheets into tests
-* Option to reorder test output to make it easier to localise errors
 * Tool to create minimal failing example out of test run
+* The whole thing is slow. Could hold the whole excel AST in memory and apply transforms?

data/src/compile/c/excel_to_c_runtime.c

@@ -76,6 +76,8 @@ static ExcelValue pv_3(ExcelValue a_v, ExcelValue b_v, ExcelValue c_v);
 static ExcelValue pv_4(ExcelValue a_v, ExcelValue b_v, ExcelValue c_v, ExcelValue d_v);
 static ExcelValue pv_5(ExcelValue a_v, ExcelValue b_v, ExcelValue c_v, ExcelValue d_v, ExcelValue e_v);
 static ExcelValue excel_round(ExcelValue number_v, ExcelValue decimal_places_v);
+static ExcelValue rank(ExcelValue number_v, ExcelValue range_v, ExcelValue order_v);
+static ExcelValue rank_2(ExcelValue number_v, ExcelValue range_v);
 static ExcelValue rounddown(ExcelValue number_v, ExcelValue decimal_places_v);
 static ExcelValue roundup(ExcelValue number_v, ExcelValue decimal_places_v);
 static ExcelValue excel_int(ExcelValue number_v);
@@ -1096,7 +1098,6 @@ static ExcelValue mmult(ExcelValue a_v, ExcelValue b_v) {
   int n = a_v.columns;
   int a_rows = a_v.rows;
   int a_columns = a_v.columns;
-  int b_rows = b_v.rows;
   int b_columns = b_v.columns;
   ExcelValue *result = (ExcelValue*) new_excel_value_array(a_rows*b_columns);
   int i, j, k;
@@ -1220,6 +1221,50 @@ static ExcelValue power(ExcelValue a_v, ExcelValue b_v) {
     return new_excel_number(result);
   }
 }
+static ExcelValue rank(ExcelValue number_v, ExcelValue range_v, ExcelValue order_v) {
+  CHECK_FOR_PASSED_ERROR(number_v)
+  CHECK_FOR_PASSED_ERROR(range_v)
+  CHECK_FOR_PASSED_ERROR(order_v)
+
+  NUMBER(number_v, number)
+  NUMBER(order_v, order)
+
+  ExcelValue *array;
+  int size;
+
+	CHECK_FOR_CONVERSION_ERROR
+
+  if(range_v.type != ExcelRange) {
+    array = new_excel_value_array(1);
+    array[0] = range_v;
+    size = 1;
+  } else {
+    array = range_v.array;
+    size = range_v.rows * range_v.columns;
+  }
+
+  int ranked = 1;
+  int found = false;
+
+  int i;
+  ExcelValue cell;
+
+  for(i=0; i<size; i++) {
+    cell = array[i];
+    if(cell.type == ExcelError) { return cell; }
+    if(cell.type == ExcelNumber) {
+      if(cell.number == number) { found = true; }
+      if(order == 0) { if(cell.number > number) { ranked++; } }
+      if(order != 0) { if(cell.number < number) { ranked++; } }
+    }
+  }
+  if(found == false) { return NA; }
+  return new_excel_number(ranked);
+}
+
+static ExcelValue rank_2(ExcelValue number_v, ExcelValue range_v) {
+  return rank(number_v, range_v, ZERO);
+}
 
 static ExcelValue excel_round(ExcelValue number_v, ExcelValue decimal_places_v) {
 	CHECK_FOR_PASSED_ERROR(number_v)
@@ -1693,7 +1738,7 @@ static ExcelValue text(ExcelValue number_v, ExcelValue format_v) {
     return format_v;
   }
 
-  if(format_v.string == "0%") {
+  if(strcmp(format_v.string,"0%") == 0) {
     // FIXME: Too little? 
     s = malloc(100);
     free_later(s);
@@ -2525,6 +2570,25 @@ int test_functions() {
   assert(mmult_result_5_a[2].type == ExcelError);
   assert(mmult_result_5_a[3].type == ExcelError);
 
+  // Test the RANK() function
+  ExcelValue rank_1_a[] = { FIVE, BLANK, THREE, ONE, ONE, FOUR, FIVE, TRUE, SIX, new_excel_string("Hi")};
+  ExcelValue rank_2_a[] = { FIVE, BLANK, THREE, NA, ONE, FOUR, FIVE, TRUE, SIX, new_excel_string("Hi")};
+  ExcelValue rank_1_v = new_excel_range( rank_1_a, 2, 5);
+  ExcelValue rank_2_v = new_excel_range( rank_2_a, 2, 5);
+
+  // Basics
+  assert(rank(THREE, rank_1_v, ZERO).number == 5);
+  assert(rank_2(THREE, rank_1_v).number == 5);
+  assert(rank(THREE, rank_1_v, ONE).number == 3);
+  assert(rank(ONE, rank_1_v, ZERO).number == 6);
+  assert(rank(new_excel_string("3"), rank_1_v, ONE).number == 3);
+
+  // Errors
+  assert(rank(TEN, rank_1_v, ZERO).type == ExcelError);
+  assert(rank(THREE, rank_2_v, ZERO).type == ExcelError);
+
+
+
   // Release memory
   free_all_allocated_memory();
   

data/src/compile/c/map_formulae_to_c.rb

@@ -60,6 +60,8 @@ class MapFormulaeToC < MapValuesToC
     'PV3' => 'pv_3',
     'PV4' => 'pv_4',
     'PV5' => 'pv_5',
+    'RANK2' => 'rank_2',
+    'RANK3' => 'rank',
     'ROUND' => 'excel_round',
     'ROUNDDOWN' => 'rounddown',
     'ROUNDUP' => 'roundup',

data/src/compile/ruby/map_formulae_to_ruby.rb

@@ -44,6 +44,7 @@ class MapFormulaeToRuby < MapValuesToRuby
     'PMT' => 'pmt',
     'POWER' => 'power',
     'PV' => 'pv',
+    'RANK' => 'rank',
     'ROUND' => 'round',
     'ROUNDDOWN' => 'rounddown',
     'ROUNDUP' => 'roundup',

data/src/excel/excel_functions.rb

@@ -85,3 +85,5 @@ require_relative 'excel_functions/hlookup'
 require_relative 'excel_functions/log'
 
 require_relative 'excel_functions/mmult'
+
+require_relative 'excel_functions/rank'

data/src/excel/excel_functions/rank.rb

@@ -0,0 +1,29 @@
+module ExcelFunctions
+  
+  def rank(number, list, order = 0)
+    number = number_argument(number)
+    order = number_argument(order)
+    list = [[list]] unless list.is_a?(Array)
+
+    return number if number.is_a?(Symbol)
+    return order if order.is_a?(Symbol)
+    return list if list.is_a?(Symbol)
+    
+    ranked = 1
+    found = false
+
+    list.flatten.each do |cell|
+      return cell if cell.is_a?(Symbol)
+      next unless cell.is_a?(Numeric)
+      found = true if cell == number
+      if order == 0
+        ranked += 1 if cell > number
+      else
+        ranked +=1 if cell < number
+      end
+    end
+    return :na unless found
+    return ranked
+  end
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.20
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -157,6 +157,7 @@ files:
 - src/excel/excel_functions/pmt.rb
 - src/excel/excel_functions/power.rb
 - src/excel/excel_functions/pv.rb
+- src/excel/excel_functions/rank.rb
 - src/excel/excel_functions/round.rb
 - src/excel/excel_functions/rounddown.rb
 - src/excel/excel_functions/roundup.rb
@@ -235,7 +236,8 @@ files:
 - bin/excel_to_c
 - bin/excel_to_ruby
 homepage: http://github.com/tamc/excel_to_code
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []