congruence_solver 0.3.1 → 0.3.2

data/ext/congruence_solver/prime_gen.c

@@ -1,146 +1,146 @@
-#include "prime_gen.h"
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
-
-#define FIRST_PRIME 2
-
-static void expand_prime_list_to_length(int length);
-static void expand_prime_list_past(int max);
-static int any_divisors(int * div_list, int length, int num);
-static int least_divisor(int n);
-
-static int * PRIME_LIST = NULL;
-static int PRIME_LIST_LENGTH = 0;
-static int PRIME_LIST_MAX_LENGTH = 0;
-static int NEXT_INTEGER = FIRST_PRIME;
-
-
-int * primes(int length){
-  int * rtrn_list = calloc(length, sizeof(int));
-
-  expand_prime_list_to_length(length);
-
-  if(rtrn_list != NULL){
-    memcpy(rtrn_list, PRIME_LIST, length*sizeof(int));
-  }
-
-  return rtrn_list;
-}
-
-
-int * primes_upto(int max){
-  int * rtrn_list;
-  int i;
-
-  expand_prime_list_past(max);
-
-  for(i = PRIME_LIST_LENGTH; i > 0; i--){
-    if(PRIME_LIST[i-1] <= max){
-      rtrn_list = calloc(i+1, sizeof(int));
-      rtrn_list[0] = i;
-      memcpy(rtrn_list+1, PRIME_LIST, i*sizeof(int));
-      return rtrn_list;
-    }
-  }
-
-  return NULL;
-}
-
-
-int * prime_factors(int n){
-  int * rtrn_list = malloc(sizeof(int));
-  int rtrn_list_length = 0;
-  int least_div;
-
-  while(n != 1){
-    least_div = least_divisor(n);
-    rtrn_list = realloc(rtrn_list, (rtrn_list_length+2)*sizeof(int));
-    rtrn_list[++rtrn_list_length] = least_div;
-
-    if(least_div == n){
-      break;
-    }
-
-    while(n % least_div == 0){
-      n /= least_div;
-    }
-  }
-
-  rtrn_list[0] = rtrn_list_length;
-
-  return rtrn_list;
-}
-
-
-static int least_divisor(int n){
-  //Calculate maximum for least divisor (sqrt)
-  int least_div_max = sqrt(n) + 1;
-  int i;
-  //Expand prime list up to the least divisor
-  expand_prime_list_past(least_div_max);
-
-
-  for(i = 0; PRIME_LIST[i] < least_div_max; i++){
-    if(n % PRIME_LIST[i] == 0){
-      return PRIME_LIST[i];
-    }
-  }
-
-  return n;
-}
-
-
-static void expand_prime_list_to_length(int length){
-
-  if(PRIME_LIST_MAX_LENGTH < length){
-    PRIME_LIST_MAX_LENGTH = 2*length;
-    PRIME_LIST = realloc(PRIME_LIST, PRIME_LIST_MAX_LENGTH*sizeof(int));
-  }
-
-  while(PRIME_LIST_LENGTH < length){
-    if( !any_divisors(PRIME_LIST, PRIME_LIST_LENGTH, NEXT_INTEGER) ){
-      PRIME_LIST[PRIME_LIST_LENGTH++] = NEXT_INTEGER;
-    }
-
-    NEXT_INTEGER++;
-  }
-
-}
-
-
-static void expand_prime_list_past(int max){
-  if(PRIME_LIST == NULL){
-    //TODO: find better heuristic limit on memory necessary to allocate
-    PRIME_LIST_MAX_LENGTH = (max/2) + 1;
-    PRIME_LIST = calloc(PRIME_LIST_MAX_LENGTH, sizeof(int));
-    PRIME_LIST[0] = NEXT_INTEGER++;
-    PRIME_LIST_LENGTH = 1;
-  }
-  
-  while(PRIME_LIST[PRIME_LIST_LENGTH-1] <= max){
-    while(any_divisors(PRIME_LIST, PRIME_LIST_LENGTH, NEXT_INTEGER) ){
-      NEXT_INTEGER++;
-    }
-
-    if( PRIME_LIST_MAX_LENGTH <= PRIME_LIST_LENGTH){
-      PRIME_LIST_MAX_LENGTH *= 2;
-      PRIME_LIST = realloc(PRIME_LIST, PRIME_LIST_MAX_LENGTH*sizeof(int));
-    }
-
-    PRIME_LIST[PRIME_LIST_LENGTH++] = NEXT_INTEGER;
-  }
-}
-
-
-static int any_divisors(int * div_list, int length, int num){
-  int i;
-  for(i = 0; i < length; i++){
-    if(num % div_list[i] == 0){
-      return 1;
-    }
-  }
-
-  return 0;
-}
+#include "prime_gen.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
+
+#define FIRST_PRIME 2
+
+static void expand_prime_list_to_length(int length);
+static void expand_prime_list_past(int max);
+static int any_divisors(int * div_list, int length, int num);
+static int least_divisor(int n);
+
+static int * PRIME_LIST = NULL;
+static int PRIME_LIST_LENGTH = 0;
+static int PRIME_LIST_MAX_LENGTH = 0;
+static int NEXT_INTEGER = FIRST_PRIME;
+
+
+int * primes(int length){
+	int * rtrn_list = calloc(length, sizeof(int));
+
+	expand_prime_list_to_length(length);
+
+	if(rtrn_list != NULL){
+		memcpy(rtrn_list, PRIME_LIST, length*sizeof(int));
+	}
+
+	return rtrn_list;
+}
+
+
+int * primes_upto(int max){
+	int * rtrn_list;
+	int i;
+
+	expand_prime_list_past(max);
+
+	for(i = PRIME_LIST_LENGTH; i > 0; i--){
+		if(PRIME_LIST[i-1] <= max){
+			rtrn_list = calloc(i+1, sizeof(int));
+			rtrn_list[0] = i;
+			memcpy(rtrn_list+1, PRIME_LIST, i*sizeof(int));
+			return rtrn_list;
+		}
+	}
+
+	return NULL;
+}
+
+
+int * prime_factors(int n){
+	int * rtrn_list = malloc(sizeof(int));
+	int rtrn_list_length = 0;
+	int least_div;
+
+	while(n != 1){
+		least_div = least_divisor(n);
+		rtrn_list = realloc(rtrn_list, (rtrn_list_length+2)*sizeof(int));
+		rtrn_list[++rtrn_list_length] = least_div;
+
+		if(least_div == n){
+			break;
+		}
+
+		while(n % least_div == 0){
+			n /= least_div;
+		}
+	}
+
+	rtrn_list[0] = rtrn_list_length;
+
+	return rtrn_list;
+}
+
+
+static int least_divisor(int n){
+	//Calculate maximum for least divisor (sqrt)
+	int least_div_max = sqrt(n) + 1;
+	int i;
+	//Expand prime list up to the least divisor
+	expand_prime_list_past(least_div_max);
+
+
+	for(i = 0; PRIME_LIST[i] < least_div_max; i++){
+		if(n % PRIME_LIST[i] == 0){
+			return PRIME_LIST[i];
+		}
+	}
+
+	return n;
+}
+
+
+static void expand_prime_list_to_length(int length){
+
+	if(PRIME_LIST_MAX_LENGTH < length){
+		PRIME_LIST_MAX_LENGTH = 2*length;
+		PRIME_LIST = realloc(PRIME_LIST, PRIME_LIST_MAX_LENGTH*sizeof(int));
+	}
+
+	while(PRIME_LIST_LENGTH < length){
+		if( !any_divisors(PRIME_LIST, PRIME_LIST_LENGTH, NEXT_INTEGER) ){
+			PRIME_LIST[PRIME_LIST_LENGTH++] = NEXT_INTEGER;
+		}
+
+		NEXT_INTEGER++;
+	}
+
+}
+
+
+static void expand_prime_list_past(int max){
+	if(PRIME_LIST == NULL){
+		//TODO: find better heuristic limit on memory necessary to allocate
+		PRIME_LIST_MAX_LENGTH = (max/2) + 1;
+		PRIME_LIST = calloc(PRIME_LIST_MAX_LENGTH, sizeof(int));
+		PRIME_LIST[0] = NEXT_INTEGER++;
+		PRIME_LIST_LENGTH = 1;
+	}
+	
+	while(PRIME_LIST[PRIME_LIST_LENGTH-1] <= max){
+		while(any_divisors(PRIME_LIST, PRIME_LIST_LENGTH, NEXT_INTEGER) ){
+			NEXT_INTEGER++;
+		}
+
+		if( PRIME_LIST_MAX_LENGTH <= PRIME_LIST_LENGTH){
+			PRIME_LIST_MAX_LENGTH *= 2;
+			PRIME_LIST = realloc(PRIME_LIST, PRIME_LIST_MAX_LENGTH*sizeof(int));
+		}
+
+		PRIME_LIST[PRIME_LIST_LENGTH++] = NEXT_INTEGER;
+	}
+}
+
+
+static int any_divisors(int * div_list, int length, int num){
+	int i;
+	for(i = 0; i < length; i++){
+		if(num % div_list[i] == 0){
+			return 1;
+		}
+	}
+
+	return 0;
+}

data/ext/congruence_solver/prime_gen.h

@@ -1,10 +1,10 @@
-#ifndef H_PRIME_GEN
-#define H_PRIME_GEN
-int * primes(int n);
-
-//Generation of primes is currently time-prohibitive when generating up to large maximums. 
-//This should be acceptable for prime factorization because although naive the algorithm is 
-//somewhat optimized to detect relatively large prime factors.
-int * primes_upto(int max);
-int * prime_factors(int n);
+#ifndef H_PRIME_GEN
+#define H_PRIME_GEN
+int * primes(int n);
+
+//Generation of primes is currently time-prohibitive when generating up to large maximums. 
+//This should be acceptable for prime factorization because although naive the algorithm is 
+//somewhat optimized to detect relatively large prime factors.
+int * primes_upto(int max);
+int * prime_factors(int n);
 #endif

data/lib/congruence_solver/version.rb

@@ -1,3 +1,3 @@
 module CongruenceSolver
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/polynomial_interpreter.rb

@@ -1,116 +1,113 @@
-class PolynomialInterpreter
-  module Errors
-    POLYNOMIAL_INVALID = ArgumentError.new "polynomial invalid"
-    CONGRUENCE_INVALID = ArgumentError.new "congruence invalid"
-    LHS_POLYNOMIAL_INVALID = ArgumentError.new "lhs polynomial invalid"
-    RHS_POLYNOMIAL_INVALID = ArgumentError.new "rhs polynomial invalid"
-    MOD_INVALID = ArgumentError.new "mod invalid"
-  end
-
-
-  def self.read_congruence(input_congruence)
-    match_data = input_congruence.match(/^(.*)=(.*) +(?:mod +(.*)|\(mod +(.*)\))$/)
-
-    if match_data.nil? 
-      raise Errors::CONGRUENCE_INVALID 
-    end
-
-    lhs = match_data[1]
-    rhs = match_data[2]
-    mod = match_data[3] || match_data[4]
-
-    begin
-      lh_coeffs = read_coeffs(lhs.gsub(" ", ""))
-    rescue ArgumentError => e
-      if(e == Errors::POLYNOMIAL_INVALID)
-        raise "#{lhs}:#{Errors::RHS_POLYNOMIAL_INVALID}"
-      else
-        raise e
-      end
-    end
-
-    begin
-      rh_coeffs = read_coeffs(rhs.gsub(" ", ""))
-    rescue ArgumentError => e
-      if e == Errors::POLYNOMIAL_INVALID
-        raise "#{rhs}:#{Errors::RHS_POLYNOMIAL_INVALID}"
-      else
-        raise e
-      end
-    end
-
-    if mod !~ /\d+/ or mod.to_i < 2
-      raise Errors::MOD_INVALID
-    end
-
-    0.upto rh_coeffs.length-1 do |idx|
-      unless rh_coeffs[idx].nil?
-        lh_coeffs[idx] ||= 0
-        lh_coeffs[idx] -= rh_coeffs[idx]
-      end
-    end
-
-    [lh_coeffs, mod.to_i]
-  end
-
-  def self.read_coeffs(input_polynomial)
-    if input_polynomial == ""
-      raise Errors::POLYNOMIAL_INVALID
-    end
-
-    last_var = nil
-    coeffs = Array.new
-
-    loop do
-      input_polynomial.slice!(/^(\d+)\*?/)
-      match_data_coe = Regexp.last_match
-
-      input_polynomial.slice!(/^([a-zA-Z])(?:\^(\d+))?/)
-      match_data_exp = Regexp.last_match
-
-      if match_data_coe.nil? and match_data_exp.nil? 
-        raise Errors::POLYNOMIAL_INVALID 
-      else 
-        if match_data_exp.nil?
-          coe = match_data_coe[1].to_i
-          exp = 0
-        else
-          unless last_var.nil? or last_var == match_data_exp[1]
-              raise Errors::POLYNOMIAL_INVALID
-          end
-
-          last_var = match_data_exp[1]
-
-          if match_data_coe.nil?
-            coe = 1
-          else
-            coe = match_data_coe[1].to_i
-          end
-            
-          if match_data_exp[2].nil?
-              exp = 1
-          else
-            exp = match_data_exp[2].to_i
-          end
-        end
-      end
-
-      coeffs[exp] ||= 0
-      coeffs[exp] += coe.to_i
-
-      break if input_polynomial.length == 0
-
-      op = input_polynomial.slice!(0)
-
-      unless op.match /[-+]/
-        raise Errors::POLYNOMIAL_INVALID
-      end
-    end
-
-    0.upto(coeffs.length-1) do |idx|
-      coeffs[idx] ||= 0
-    end
-
-    coeffs
-  end
-end
+class PolynomialInterpreter
+  module Errors
+    POLYNOMIAL_INVALID = ArgumentError.new "polynomial invalid"
+    CONGRUENCE_INVALID = ArgumentError.new "congruence invalid"
+    LHS_POLYNOMIAL_INVALID = ArgumentError.new "lhs polynomial invalid"
+    RHS_POLYNOMIAL_INVALID = ArgumentError.new "rhs polynomial invalid"
+    MOD_INVALID = ArgumentError.new "mod invalid"
+  end
+
+
+  def self.read_congruence(input_congruence)
+    match_data = input_congruence.match(/^(.*)=(.*) +(?:mod +(.*)|\(mod +(.*)\))$/)
+
+    if match_data.nil?
+      raise Errors::CONGRUENCE_INVALID
+    end
+
+    lhs = match_data[1]
+    rhs = match_data[2]
+    mod = match_data[3] || match_data[4]
+
+    begin
+      lh_coeffs = read_coeffs(lhs.gsub(" ", ""))
+    rescue ArgumentError
+        raise Errors::LHS_POLYNOMIAL_INVALID
+    end
+
+    begin
+      rh_coeffs = read_coeffs(rhs.gsub(" ", ""))
+    rescue ArgumentError
+        raise Errors::RHS_POLYNOMIAL_INVALID
+    end
+
+    if mod !~ /\d+/ or mod.to_i < 2
+      raise Errors::MOD_INVALID
+    end
+
+    0.upto rh_coeffs.length-1 do |idx|
+      unless rh_coeffs[idx].nil?
+        lh_coeffs[idx] ||= 0
+        lh_coeffs[idx] -= rh_coeffs[idx]
+      end
+    end
+
+    [lh_coeffs, mod.to_i]
+  end
+
+  def self.read_coeffs(input_polynomial)
+    if input_polynomial == ""
+      raise Errors::POLYNOMIAL_INVALID
+    end
+
+    last_var = nil
+    coeffs = Array.new
+
+    unless input_polynomial[0].match /[-+]/
+      input_polynomial = "+" + input_polynomial
+    end
+
+    while input_polynomial.length > 0 do
+      op = input_polynomial.slice!(0)
+      unless op =~ /[-+]/
+        raise Errors::POLYNOMIAL_INVALID
+      end
+
+      input_polynomial.slice!(/^(\d+)\*?/)
+      match_data_coe = Regexp.last_match
+
+      input_polynomial.slice!(/^([a-zA-Z])(?:\^(\d+))?/)
+      match_data_exp = Regexp.last_match
+
+      if match_data_coe.nil? and match_data_exp.nil?
+        raise Errors::POLYNOMIAL_INVALID
+      else
+        if match_data_exp.nil?
+          coe = match_data_coe[1].to_i
+          exp = 0
+        else
+          unless last_var.nil? or last_var == match_data_exp[1]
+              raise Errors::POLYNOMIAL_INVALID
+          end
+
+          last_var = match_data_exp[1]
+
+          if match_data_coe.nil?
+            coe = 1
+          else
+            coe = match_data_coe[1].to_i
+          end
+
+          if match_data_exp[2].nil?
+              exp = 1
+          else
+            exp = match_data_exp[2].to_i
+          end
+        end
+      end
+
+      coeffs[exp] ||= 0
+      if op == "-"
+        coeffs[exp] -= coe.to_i
+      else
+        coeffs[exp] += coe.to_i
+      end
+    end
+
+    0.upto(coeffs.length-1) do |idx|
+      coeffs[idx] ||= 0
+    end
+
+    coeffs
+  end
+end