congruence_solver 0.3.0 → 0.3.1

data/ext/congruence_solver/prime_gen.c

@@ -18,129 +18,129 @@ static int NEXT_INTEGER = FIRST_PRIME;
 
 
 int * primes(int length){
-	int * rtrn_list = calloc(length, sizeof(int));
+  int * rtrn_list = calloc(length, sizeof(int));
 
-	expand_prime_list_to_length(length);
+  expand_prime_list_to_length(length);
 
-	if(rtrn_list != NULL){
-		memcpy(rtrn_list, PRIME_LIST, length*sizeof(int));
-	}
+  if(rtrn_list != NULL){
+    memcpy(rtrn_list, PRIME_LIST, length*sizeof(int));
+  }
 
-	return rtrn_list;
+  return rtrn_list;
 }
 
 
 int * primes_upto(int max){
-	int * rtrn_list;
-	int i;
+  int * rtrn_list;
+  int i;
 
-	expand_prime_list_past(max);
+  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;
-		}
-	}
+  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;
+  return NULL;
 }
 
 
 int * prime_factors(int n){
-	int * rtrn_list = malloc(sizeof(int));
-	int rtrn_list_length = 0;
-	int least_div;
+  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;
+  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;
-		}
+    if(least_div == n){
+      break;
+    }
 
-		while(n % least_div == 0){
-			n /= least_div;
-		}
-	}
+    while(n % least_div == 0){
+      n /= least_div;
+    }
+  }
 
-	rtrn_list[0] = rtrn_list_length;
+  rtrn_list[0] = rtrn_list_length;
 
-	return rtrn_list;
+  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);
+  //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];
-		}
-	}
+  for(i = 0; PRIME_LIST[i] < least_div_max; i++){
+    if(n % PRIME_LIST[i] == 0){
+      return PRIME_LIST[i];
+    }
+  }
 
-	return n;
+  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));
-	}
+  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;
-		}
+  while(PRIME_LIST_LENGTH < length){
+    if( !any_divisors(PRIME_LIST, PRIME_LIST_LENGTH, NEXT_INTEGER) ){
+      PRIME_LIST[PRIME_LIST_LENGTH++] = NEXT_INTEGER;
+    }
 
-		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;
-	}
+  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;
+  int i;
+  for(i = 0; i < length; i++){
+    if(num % div_list[i] == 0){
+      return 1;
+    }
+  }
+
+  return 0;
 }

data/ext/congruence_solver/test/arith_utils_test.h

@@ -1,5 +1,5 @@
 #define NUM_OF_MOD_INV_TESTS 4
-#define NUM_OF_MOD_PRODUCT_TESTS 4
+#define NUM_OF_MOD_PRODUCT_TESTS 3
 #define NUM_OF_MOD_POWER_TESTS 4
 #define NUM_OF_COPRIME_TESTS 5
 #define NUM_OF_TOTIENT_TESTS 6
@@ -11,15 +11,15 @@ int TOTIENT_EVALS[NUM_OF_TOTIENT_TESTS] = {1, 1, 2, 40, 100, 3680};
 int COPRIME_NUM_PAIRS[NUM_OF_COPRIME_TESTS][2] = {{3,5}, {9, 28}, {100, 34}, {1000512415, 557825}, {2286144, 1515839}};
 int COPRIME_EVALS[NUM_OF_COPRIME_TESTS] = {1, 1, 0, 0, 1};
 
-int MOD_PRODUCT_NUM_PAIRS[NUM_OF_MOD_PRODUCT_TESTS][2] = {{5,6}, {41,3}, {16, 98}, {105, 203}};
-int MOD_PRODUCT_MODS[NUM_OF_MOD_PRODUCT_TESTS] = {10, 8, 19, 98};
-int MOD_PRODUCT_PRODUCTS[NUM_OF_MOD_PRODUCT_TESTS] = {0, 3, 10, 49};
+int MOD_PRODUCT_NUM_PAIRS[NUM_OF_MOD_PRODUCT_TESTS][2] = {{5,6}, {41,3}, {16, 3}};
+int MOD_PRODUCT_MODS[NUM_OF_MOD_PRODUCT_TESTS] = {10, 8, 19};
+int MOD_PRODUCT_PRODUCTS[NUM_OF_MOD_PRODUCT_TESTS] = {0, 3, 10};
 
-int MOD_INV_NUMS[NUM_OF_MOD_INV_TESTS] = {5, 4, 53, 129};
+int MOD_INV_NUMS[NUM_OF_MOD_INV_TESTS] = {5, 4, 53, 3};
 int MOD_INV_MODS[NUM_OF_MOD_INV_TESTS] = {12, 23, 105, 7};
 int MOD_INV_INVS[NUM_OF_MOD_INV_TESTS] = {5, 6, 2, 5};
 
-int MOD_POWER_NUMS[NUM_OF_MOD_POWER_TESTS] = {5, 19, 41, 100};
+int MOD_POWER_NUMS[NUM_OF_MOD_POWER_TESTS] = {3, 19, 6, 7};
 int MOD_POWER_MODS[NUM_OF_MOD_POWER_TESTS] = {4, 23, 7, 33};
 int MOD_POWER_POWERS[NUM_OF_MOD_POWER_TESTS] = {10, 3, 4, 635};
-int MOD_POWER_EVALS[NUM_OF_MOD_POWER_TESTS] ={1, 5, 1, 1};
+int MOD_POWER_EVALS[NUM_OF_MOD_POWER_TESTS] ={1, 5, 1, 10};

data/ext/congruence_solver/test/congruences_test.c

@@ -13,7 +13,7 @@ int main(){
 	failures += solve_congruence_test(POL_3_DEGREE, POL_3_COEFFS, POL_3_MOD, NUM_OF_POL_3_SOLS, POL_3_SOLS);
 	failures += solve_congruence_test(POL_4_DEGREE, POL_4_COEFFS, POL_4_MOD, NUM_OF_POL_4_SOLS, POL_4_SOLS);
 	failures += solve_congruence_test(POL_5_DEGREE, POL_5_COEFFS, POL_5_MOD, NUM_OF_POL_5_SOLS, POL_5_SOLS);
-
+	failures += solve_congruence_test(POL_6_DEGREE, POL_6_COEFFS, POL_6_MOD, NUM_OF_POL_6_SOLS, POL_6_SOLS);
 
 	return failures;
 }
@@ -54,7 +54,7 @@ int solve_congruence_test(int func_degree, int * func_coeffs, int mod, int num_o
 			
 			print_polynomial_inline(func_degree, func_coeffs);
 
-			printf(" = 0: %d given instead of %d.\n\n", solutions_to_test[i+1], solutions[i]);
+			printf(" = 0 (mod %d): %d given instead of %d.\n\n", mod, solutions_to_test[i+1], solutions[i]);
 
 			return 1;
 		}

data/ext/congruence_solver/test/congruences_test.h

@@ -105,6 +105,24 @@
 #define POL_5_SOL_7 299584
 #define POL_5_SOL_8 313399
 
+#define POL_6_DEGREE 5
+#define POL_6_COEFF_0 1
+#define POL_6_COEFF_1 2
+#define POL_6_COEFF_2 1
+#define POL_6_COEFF_3 -1
+#define POL_6_COEFF_4 0
+#define POL_6_COEFF_5 -3
+#define POL_6_MOD 49
+#define NUM_OF_POL_6_SOLS 8
+#define POL_6_SOL_0 1
+#define POL_6_SOL_1 8
+#define POL_6_SOL_2 15
+#define POL_6_SOL_3 22
+#define POL_6_SOL_4 26
+#define POL_6_SOL_5 29
+#define POL_6_SOL_6 36
+#define POL_6_SOL_7 43
+
 
 int POL_1_COEFFS[POL_1_DEGREE+1] = {POL_1_COEFF_0, 
 									POL_1_COEFF_1, 
@@ -201,4 +219,21 @@ int POL_5_SOLS[NUM_OF_POL_5_SOLS] = {POL_5_SOL_0,
 									POL_5_SOL_5,
 									POL_5_SOL_6,
 									POL_5_SOL_7,
-									POL_5_SOL_8};
+									POL_5_SOL_8};
+
+int POL_6_COEFFS[POL_6_DEGREE+1] = {POL_6_COEFF_0,
+									POL_6_COEFF_1,
+									POL_6_COEFF_2,
+									POL_6_COEFF_3,
+									POL_6_COEFF_4,
+									POL_6_COEFF_5
+									};
+
+int POL_6_SOLS[NUM_OF_POL_6_SOLS] = {POL_6_SOL_0,
+									 POL_6_SOL_1,
+									 POL_6_SOL_2,
+									 POL_6_SOL_3,
+									 POL_6_SOL_4,
+									 POL_6_SOL_5,
+									 POL_6_SOL_6,
+									 POL_6_SOL_7};

data/lib/congruence_solver/version.rb

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

data/lib/polynomial_interpreter.rb

@@ -1,116 +1,116 @@
 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 Errors::LHS_POLYNOMIAL_INVALID
-			else
-				raise e
-			end
-		end
-
-		begin
-			rh_coeffs = read_coeffs(rhs.gsub(" ", ""))
-		rescue ArgumentError => e
-			if e == Errors::POLYNOMIAL_INVALID
-				raise 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 ArgumentError, INVALID_POLYNOMIAL_MSG 
-			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
+  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

data/spec/congruence_solver_spec.rb

@@ -1,38 +1,38 @@
 require "congruence_solver"
 
 RSpec.describe CongruenceSolver do
-	describe "::lift" do
-		it "expects 3 arguments" do
-			expect {CongruenceSolver.lift()}.to raise_error ArgumentError
-			expect {CongruenceSolver.lift(0)}.to raise_error ArgumentError
-			expect {CongruenceSolver.lift([1,2], 3)}.not_to raise_error
-			expect {CongruenceSolver.lift([1], [1], nil)}.to raise_error ArgumentError
-		end
-
-
-		it "solves individual polynomial congruences defined by their coefficients and mod" do
-			coeffs = [-1, 0, 4]
-			mod = 5
-			expect(CongruenceSolver.lift(coeffs, mod).sort).to eq [2, 3]
-
-			coeffs = [-3, 4, 9]
-			mod = 49
-			expect(CongruenceSolver.lift(coeffs, mod).sort).to eq []
-
-			coeffs = [1, -4, 4]
-			mod = 5104
-			expect(CongruenceSolver.lift(coeffs, mod).sort).to eq []
-
-			coeffs = [4, -4, 1]
-			mod = 5104
-			expect(CongruenceSolver.lift(coeffs, mod).sort).to eq [2, 1278, 2554, 3830]
-
-			coeffs = Array.new(500, 0)
-			coeffs[0] = -1
-			coeffs[500] = 1
-			mod = 15
-			expect(CongruenceSolver.lift(coeffs, mod).sort).to eq [1, 2, 4, 7, 8, 11, 13, 14]
-		end
-
-	end
+  describe "::lift" do
+    it "expects 3 arguments" do
+      expect {CongruenceSolver.lift()}.to raise_error ArgumentError
+      expect {CongruenceSolver.lift(0)}.to raise_error ArgumentError
+      expect {CongruenceSolver.lift([1,2], 3)}.not_to raise_error
+      expect {CongruenceSolver.lift([1], [1], nil)}.to raise_error ArgumentError
+    end
+
+
+    it "solves individual polynomial congruences defined by their coefficients and mod" do
+      coeffs = [-1, 0, 4]
+      mod = 5
+      expect(CongruenceSolver.lift(coeffs, mod).sort).to eq [2, 3]
+
+      coeffs = [-3, 4, 9]
+      mod = 49
+      expect(CongruenceSolver.lift(coeffs, mod).sort).to eq []
+
+      coeffs = [1, -4, 4]
+      mod = 5104
+      expect(CongruenceSolver.lift(coeffs, mod).sort).to eq []
+
+      coeffs = [4, -4, 1]
+      mod = 5104
+      expect(CongruenceSolver.lift(coeffs, mod).sort).to eq [2, 1278, 2554, 3830]
+
+      coeffs = Array.new(500, 0)
+      coeffs[0] = -1
+      coeffs[500] = 1
+      mod = 15
+      expect(CongruenceSolver.lift(coeffs, mod).sort).to eq [1, 2, 4, 7, 8, 11, 13, 14]
+    end
+
+  end
 end