excel_to_code 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f0ca6f9f95aa9175bde4d6cdce638d4d11d09b3
-  data.tar.gz: f0ceec9fc7895942395cecb4b03428eb01bac979
+  metadata.gz: 880640b9610ce6658c3ba7a5ff8d6f96048d0705
+  data.tar.gz: 08f680f1229c0e00d769b3b7024e452a32a5ebd5
 SHA512:
-  metadata.gz: 32560230728d0caaab4d270fd3e9faa6190160ad5fe4b198cacab2ca89d80cc4bdf9a039a5c9eabeacd3cb55bdc0bd6f225af6c432e256ba20f1787945d603c7
-  data.tar.gz: a2b72b13008837e562abbc86100925871ce33ba9f5fa47cf76d012aba306ac3f0756bdba35e77f552afa54f5e9a2d0bd26b8c3410446dbd0e884a44494b04511
+  metadata.gz: 244303086ecf46f8be290f2d1c46f4c2b929c21b2bca0f7129d9edeb65e06e068824039250f650d12b3eaa4f85b2e9d08423b042cbf71b68e9a4d9f4c3311e4f
+  data.tar.gz: d40bf490120ec061bf94fbf65c32daf136edd1d9abefb833c1e1cf8a0c17940d80c6fe5e8ca8fd436c22aad17db8f3cbdc5312a55338317ab16614b7be107c98

data/src/compile/c/excel_to_c_runtime.c

@@ -58,6 +58,7 @@ static ExcelValue find(ExcelValue string_to_look_for_v, ExcelValue string_to_loo
 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 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);
 static ExcelValue max(int number_of_arguments, ExcelValue *arguments);
@@ -69,6 +70,7 @@ static ExcelValue power(ExcelValue a_v, ExcelValue b_v);
 static ExcelValue excel_round(ExcelValue number_v, ExcelValue decimal_places_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);
 static ExcelValue string_join(int number_of_arguments, ExcelValue *arguments);
 static ExcelValue subtotal(ExcelValue type, int number_of_arguments, ExcelValue *arguments);
 static ExcelValue sumifs(ExcelValue sum_range_v, int number_of_arguments, ExcelValue *arguments);
@@ -172,6 +174,7 @@ const ExcelValue NAME = {.type = ExcelError, .number = 1};
 const ExcelValue DIV0 = {.type = ExcelError, .number = 2};
 const ExcelValue REF = {.type = ExcelError, .number = 3};
 const ExcelValue NA = {.type = ExcelError, .number = 4};
+const ExcelValue NUM = {.type = ExcelError, .number = 5};
 
 // This is the error flag
 static int conversion_error = 0;
@@ -223,6 +226,7 @@ static void inspect_excel_value(ExcelValue v) {
 			 case 2: printf("DIV0\n"); break;
 			 case 3: printf("REF\n"); break;
 			 case 4: printf("NA\n"); break;
+			 case 5: printf("NUM\n"); break;
 		 }
 		 break;
     default:
@@ -588,6 +592,61 @@ static ExcelValue excel_index_2(ExcelValue array_v, ExcelValue offset) {
 	return REF;
 };
 
+int compare_doubles (const void *a, const void *b) {
+  const double *da = (const double *) a;
+  const double *db = (const double *) b;
+
+  return (*da > *db) - (*da < *db);
+}
+
+static ExcelValue large(ExcelValue range_v, ExcelValue k_v) {
+  CHECK_FOR_PASSED_ERROR(range_v)
+  CHECK_FOR_PASSED_ERROR(k_v)
+
+  int k = (int) number_from(k_v);
+  CHECK_FOR_CONVERSION_ERROR;
+
+  // Check for edge case where just a single number passed
+  if(range_v.type == ExcelNumber) {
+    if( k == 1 ) {
+      return range_v;
+    } else {
+      return NUM;
+    }
+  }
+
+  // Otherwise grumble if not a range
+  if(!range_v.type == ExcelRange) { return VALUE; }
+
+  // Check that our k is within bounds
+  if(k < 1) { return NUM; }
+  int range_size = range_v.rows * range_v.columns;
+
+  // OK this is a really naive implementation.
+  // FIXME: implement the BFPRT algorithm
+  double *sorted = malloc(sizeof(double)*range_size);
+  int sorted_size = 0;
+  ExcelValue *array_v = range_v.array;
+  ExcelValue x_v;
+  int i; 
+  for(i = 0; i < range_size; i++ ) {
+    x_v = array_v[i];
+    if(x_v.type == ExcelError) { return x_v; };
+    if(x_v.type == ExcelNumber) {
+      sorted[sorted_size] = x_v.number;
+      sorted_size++;
+    }
+  }
+  // Check other bound
+  if(k > sorted_size) { return NUM; }
+
+  qsort(sorted, sorted_size, sizeof (double), compare_doubles);
+
+  ExcelValue result = new_excel_number(sorted[sorted_size - k]);
+  free(sorted);
+  return result;
+}
+
 
 static ExcelValue excel_match(ExcelValue lookup_value, ExcelValue lookup_array, ExcelValue match_type ) {
 	CHECK_FOR_PASSED_ERROR(lookup_value)
@@ -1061,6 +1120,15 @@ static ExcelValue roundup(ExcelValue number_v, ExcelValue decimal_places_v) {
 	return new_excel_number( ceil(number * multiple) / multiple );	
 }
 
+static ExcelValue excel_int(ExcelValue number_v) {
+	CHECK_FOR_PASSED_ERROR(number_v)
+		
+	NUMBER(number_v, number)
+	CHECK_FOR_CONVERSION_ERROR
+		
+	return new_excel_number(floor(number));
+}
+
 static ExcelValue string_join(int number_of_arguments, ExcelValue *arguments) {
 	int allocated_length = 100;
 	int used_length = 0;
@@ -1544,6 +1612,20 @@ int test_functions() {
 	assert(count(4,array1).number == 2);
 	assert(count(3,array2).number == 3);
 	assert(count(4,array3).number == 3);
+
+  // Test Large
+  ExcelValue large_test_array_1[] = { new_excel_number(10), new_excel_number(100), new_excel_number(500), BLANK };
+  ExcelValue large_test_array_1_v = new_excel_range(large_test_array_1, 1, 4);
+  assert(large(large_test_array_1_v, new_excel_number(1)).number == 500);
+  assert(large(large_test_array_1_v, new_excel_number(2)).number == 100);
+  assert(large(large_test_array_1_v, new_excel_number(3)).number == 10);
+  assert(large(large_test_array_1_v, new_excel_number(4)).type == ExcelError);
+  assert(large(new_excel_number(500), new_excel_number(1)).number == 500);
+  ExcelValue large_test_array_2[] = { new_excel_number(10), new_excel_number(100), new_excel_number(500), VALUE };
+  ExcelValue large_test_array_2_v = new_excel_range(large_test_array_2, 1, 4);
+  assert(large(large_test_array_2_v,new_excel_number(2)).type == ExcelError);
+  assert(large(new_excel_number(500),VALUE).type == ExcelError);
+
 	
 	// Test COUNTA
 	ExcelValue count_a_test_array_1[] = { new_excel_number(10), new_excel_number(5), TRUE, FALSE, new_excel_string("Hello"), VALUE, BLANK};
@@ -1867,6 +1949,10 @@ int test_functions() {
     assert(rounddown(new_excel_number(1.56),new_excel_number(1)).number == 1.5);
     assert(rounddown(new_excel_number(-1.56),new_excel_number(1)).number == -1.5);	
 
+	// Test int
+    assert(excel_int(new_excel_number(8.9)).number == 8.0);
+    assert(excel_int(new_excel_number(-8.9)).number == -9.0);
+
 	// Test roundup
     assert(roundup(new_excel_number(1.1), new_excel_number(0)).number == 2.0);
     assert(roundup(new_excel_number(1.5), new_excel_number(0)).number == 2.0);

data/src/compile/c/map_formulae_to_c.rb

@@ -41,6 +41,8 @@ class MapFormulaeToC < MapValuesToC
     'IFERROR' => 'iferror',
     'INDEX2' => 'excel_index_2',
     'INDEX3' => 'excel_index',
+    'INT' => 'excel_int',
+    'LARGE' => 'large',
     'LEFT1' => 'left_1',
     'LEFT2' => 'left',
     'MATCH2' => 'excel_match_2',

data/src/compile/ruby/map_formulae_to_ruby.rb

@@ -27,6 +27,8 @@ class MapFormulaeToRuby < MapValuesToRuby
     'IF' => 'excel_if',
     'IFERROR' => 'iferror',
     'INDEX' => 'index',
+    'INT' => 'int',
+    'LARGE' => 'large',
     'LEFT' => 'left',
     'MATCH' => 'excel_match',
     'MAX' => 'max',

data/src/excel/excel_functions.rb

@@ -24,6 +24,7 @@ require_relative 'excel_functions/subtract'
 require_relative 'excel_functions/multiply'
 require_relative 'excel_functions/divide'
 require_relative 'excel_functions/power'
+require_relative 'excel_functions/negative'
 
 # More advanced arithmetic
 require_relative 'excel_functions/abs'
@@ -35,50 +36,36 @@ require_relative 'excel_functions/sum'
 require_relative 'excel_functions/average'
 require_relative 'excel_functions/max'
 require_relative 'excel_functions/min'
-
-# Financial functions
-require_relative 'excel_functions/pmt'
-
-# Geometry functions
-require_relative 'excel_functions/cosh'
-
-# String functions
-require_relative 'excel_functions/string_join'
-require_relative 'excel_functions/excel_match'
-require_relative 'excel_functions/find'
-
-# Search functions
-require_relative 'excel_functions/choose'
-
-# Other functions
-
-
-
-
-
-
-require_relative 'excel_functions/round'
-
 require_relative 'excel_functions/subtotal'
-
 require_relative 'excel_functions/count'
-
 require_relative 'excel_functions/counta'
-
 require_relative 'excel_functions/sumif'
-
 require_relative 'excel_functions/sumifs'
-
 require_relative 'excel_functions/sumproduct'
 
+# Lookup functions
+require_relative 'excel_functions/index'
+require_relative 'excel_functions/excel_match'
 require_relative 'excel_functions/vlookup'
+require_relative 'excel_functions/choose'
+require_relative 'excel_functions/large'
 
-require_relative 'excel_functions/index'
+# Financial functions
+require_relative 'excel_functions/pmt'
 
+# Geometry functions
+require_relative 'excel_functions/cosh'
+
+# String functions
+require_relative 'excel_functions/string_join'
+require_relative 'excel_functions/find'
 require_relative 'excel_functions/left'
 
+# Rounding functions
+require_relative 'excel_functions/round'
 require_relative 'excel_functions/roundup'
-
 require_relative 'excel_functions/rounddown'
+require_relative 'excel_functions/int'
+
+# Other functions
 
-require_relative 'excel_functions/negative'

data/src/excel/excel_functions/int.rb

@@ -0,0 +1,10 @@
+module ExcelFunctions
+  
+  def int(number)
+    number = number_argument(number)
+    return number if number.is_a?(Symbol)
+    number.floor.to_f
+  end
+
+  
+end

data/src/excel/excel_functions/large.rb

@@ -0,0 +1,17 @@
+module ExcelFunctions
+  
+  def large(range, k)
+    range = [range] unless range.is_a?(Array)
+    range = range.flatten
+    error = range.find {|a| a.is_a?(Symbol)}
+    error ||= k if k.is_a?(Symbol)
+    return error if error
+    range.delete_if { |v| !v.is_a?(Numeric) }
+    return :value unless k.is_a?(Numeric)
+    return :num unless k>0 && k<=range.size
+    range.sort!
+    range.reverse!
+    range[k-1]
+  end
+  
+end

data/src/extract/extract_array_formulae.rb

@@ -16,7 +16,7 @@ class ExtractArrayFormulae < ExtractFormulae
     output.write "\t"
     output.write @array_range
     output.write "\t"
-    output.write @formula.join
+    output.write @formula.join.gsub(/[\n\r]+/,'')
     output.write "\n"
   end
 

data/src/extract/extract_shared_formulae.rb

@@ -16,7 +16,7 @@ class ExtractSharedFormulae < ExtractFormulae
     output.write "\t"
     output.write @shared_range
     output.write "\t"
-    output.write @formula.join
+    output.write @formula.join.gsub(/[\n\r]+/,'')
     output.write "\n"
   end
   

data/src/extract/extract_simple_formulae.rb

@@ -11,7 +11,7 @@ class ExtractSimpleFormulae < ExtractFormulae
     return if @formula.empty?
     output.write @ref
     output.write "\t"
-    output.write @formula.join
+    output.write @formula.join.gsub(/[\r\n]+/,'')
     output.write "\n"
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -134,6 +134,8 @@ files:
 - src/excel/excel_functions/find.rb
 - src/excel/excel_functions/iferror.rb
 - src/excel/excel_functions/index.rb
+- src/excel/excel_functions/int.rb
+- src/excel/excel_functions/large.rb
 - src/excel/excel_functions/left.rb
 - src/excel/excel_functions/less_than.rb
 - src/excel/excel_functions/less_than_or_equal.rb
@@ -238,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Converts .xlxs files into pure ruby 1.9 code or pure C code so that they