congruence_solver 0.3.1 → 0.3.2

data/bin/{csolve.rb → csolve}

@@ -1,54 +1,54 @@
-#!/usr/bin/env ruby
-require 'congruence_solver'
-require "polynomial_interpreter"
-
-
-SOLVE_CONGRUENCE_BENCH_FILE = "../bench/solve_congruence_bm.rb"
-
-
-if ARGV.pop == "bench"
-  require_relative SOLVE_CONGRUENCE_BENCH_FILE
-  exit(0)
-end
-
-CONGRUENCE_FORMAT = "(lhs polynomial) = (rhs polynomial) mod (modulus)"
-CONGRUENCE_INVALID_MSG = "Congruence invalid: congruences must be of form:\n#{CONGRUENCE_FORMAT}"
-POLYNOMIAL_FORMAT = "ax^b+cx^d...\n(integer coefficients, positive integer exponents, order irrelevant)"
-LHS_INVALID_MSG = "Left hand polynomial invalid: polynomials must be of form: #{POLYNOMIAL_FORMAT}"
-RHS_INVALID_MSG = "Right hand polynomial invalid: polynomials must be of form: #{POLYNOMIAL_FORMAT}"
-MOD_INVALID_MSG = "Mod invalid: modulus must be an integer greater than 2"
-
-puts "Congruence to solve:"
-
-begin
-  coeffs, mod = PolynomialInterpreter.read_congruence(STDIN.gets)
-rescue ArgumentError => e
-  if(e == PolynomialInterpreter::Errors::CONGRUENCE_INVALID)
-    STDERR.puts CONGRUENCE_INVALID_MSG
-    exit(1)
-
-  elsif(e == PolynomialInterpreter::Errors::LHS_POLYNOMIAL_INVALID)
-    STDERR.puts LHS_INVALID_MSG
-    exit(1)
-
-  elsif(e == PolynomialInterpreter::Errors::RHS_POLYNOMIAL_INVALID)
-    STDERR.puts RHS_INVALID_MSG
-    exit(1)
-
-  elsif(e == PolynomialInterpreter::Errors::MOD_INVALID)
-    STDERR.puts MOD_INVALID_MSG
-    exit(1)
-
-  else
-    raise e
-  end
-end
-
-solutions = CongruenceSolver.lift(coeffs, mod).sort
-
-if solutions.empty? 
-  puts "No solution."
-else
-  puts "Solutions:"
-  solutions.each_with_index {|sol, i| puts "(#{i}) #{sol}"}
+#!/usr/bin/env ruby
+require 'congruence_solver'
+require "polynomial_interpreter"
+
+
+SOLVE_CONGRUENCE_BENCH_FILE = "../bench/solve_congruence_bm.rb"
+
+
+if ARGV.pop == "bench"
+  require_relative SOLVE_CONGRUENCE_BENCH_FILE
+  exit(0)
+end
+
+CONGRUENCE_FORMAT = "(lhs polynomial) = (rhs polynomial) mod (modulus)"
+CONGRUENCE_INVALID_MSG = "Congruence invalid: congruences must be of form:\n#{CONGRUENCE_FORMAT}"
+POLYNOMIAL_FORMAT = "ax^b+cx^d...\n(integer coefficients, positive integer exponents, order irrelevant)"
+LHS_INVALID_MSG = "Left hand polynomial invalid: polynomials must be of form: #{POLYNOMIAL_FORMAT}"
+RHS_INVALID_MSG = "Right hand polynomial invalid: polynomials must be of form: #{POLYNOMIAL_FORMAT}"
+MOD_INVALID_MSG = "Mod invalid: modulus must be an integer greater than 2"
+
+puts "Congruence to solve:"
+
+begin
+  coeffs, mod = PolynomialInterpreter.read_congruence(STDIN.gets)
+rescue ArgumentError => e
+  if(e == PolynomialInterpreter::Errors::CONGRUENCE_INVALID)
+    STDERR.puts CONGRUENCE_INVALID_MSG
+    exit(1)
+
+  elsif(e == PolynomialInterpreter::Errors::LHS_POLYNOMIAL_INVALID)
+    STDERR.puts LHS_INVALID_MSG
+    exit(1)
+
+  elsif(e == PolynomialInterpreter::Errors::RHS_POLYNOMIAL_INVALID)
+    STDERR.puts RHS_INVALID_MSG
+    exit(1)
+
+  elsif(e == PolynomialInterpreter::Errors::MOD_INVALID)
+    STDERR.puts MOD_INVALID_MSG
+    exit(1)
+
+  else
+    raise e
+  end
+end
+
+solutions = CongruenceSolver.lift(coeffs, mod).sort
+
+if solutions.empty? 
+  puts "No solution."
+else
+  puts "Solutions:"
+  solutions.each_with_index {|sol, i| puts "(#{i}) #{sol}"}
 end

data/congruence_solver.gemspec

@@ -1,38 +1,32 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'congruence_solver/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "congruence_solver"
-  spec.version       = CongruenceSolver::VERSION
-  spec.authors       = ["lane"]
-  spec.email         = ["lane.barlow@gmail.com"]
-
-  spec.summary       = "A gem for solving polynomial congruences."
-  spec.description   = "Provides a class (CongruenceSolver) for finding the modular zeros of a 
-                          polynomial (given the coefficients and modulus) and a binary (csolve) to 
-                          to solve your congruences at the command line."
-  spec.homepage      = "https://github.com/laneb/congruence_solver"
-
-  spec.files         = `git ls-files`.split("\n")
-  spec.files        += `git submodule --quiet foreach pwd`.split("\n").map do |abs_dir|
-                          abs_dir = abs_dir.gsub(/^c:/, "C:")
-                          dir_in_proj = abs_dir.gsub(/^#{Dir.pwd}\/?/, "")
-                          Dir.chdir(abs_dir) do
-                            files = `git ls-files`.split("\n")
-                            files.map {|fname| "#{dir_in_proj}/#{fname}"}
-                          end
-                        end.flatten
-  spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.extensions << "ext/congruence_solver/extconf.rb"
-
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 2.4"
-  spec.add_development_dependency "rake-compiler", "~>0.9"
-  spec.add_development_dependency "os", "~>0.9"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'congruence_solver/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "congruence_solver"
+  spec.version       = CongruenceSolver::VERSION
+  spec.license       = "Apache-2.0"
+  spec.authors       = ["lane"]
+  spec.email         = ["lane.barlow@gmail.com"]
+
+  spec.summary       = "A gem for solving polynomial congruences."
+  spec.description   = "Provides a class (CongruenceSolver) for finding the modular zeros of a
+                          polynomial (given the coefficients and modulus) and a binary (csolve) to
+                          to solve your congruences at the command line."
+  spec.homepage      = "https://github.com/laneb/congruence_solver"
+
+  spec.files         = `git ls-files`.split("\n")
+  spec.files        += `(ls ext/congruence_solver)`.split("\n").map { |fname| "ext/congruence_solver/" + fname}
+  spec.bindir        = "bin"
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.extensions << "ext/congruence_solver/extconf.rb"
+
+  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rake-compiler", "~>0.9"
+  spec.add_development_dependency "os", "~>0.9"
+end

data/ext/congruence_solver/Makefile

@@ -1,18 +1,18 @@
-
-congruences_test: congruences.c test/congruences_test.c test/congruences_test.h arith_utils.c prime_gen.c
-	gcc -g prime_gen.c arith_utils.c congruences.c test/congruences_test.c -o congruences_test
-
-arith_utils_test: arith_utils.c test/arith_utils_test.c test/arith_utils_test.h prime_gen.c
-	gcc -g prime_gen.c arith_utils.c test/arith_utils_test.c -o arith_utils_test
-
-prime_gen_test: prime_gen.c test/prime_gen_test.c test/prime_gen_test.h
-	gcc -g prime_gen.c test/prime_gen_test.c -o prime_gen_test
-
-test: prime_gen_test arith_utils_test congruences_test
-	./prime_gen_test
-	./arith_utils_test
-	./congruences_test
-
-clean:
-	rm -f prime_gen_test.exe arith_utils_test.exe congruences_test.exe
+
+congruences_test: congruences.c test/congruences_test.c test/congruences_test.h arith_utils.c prime_gen.c
+	gcc -g prime_gen.c arith_utils.c congruences.c test/congruences_test.c -o congruences_test
+
+arith_utils_test: arith_utils.c test/arith_utils_test.c test/arith_utils_test.h prime_gen.c
+	gcc -g prime_gen.c arith_utils.c test/arith_utils_test.c -o arith_utils_test
+
+prime_gen_test: prime_gen.c test/prime_gen_test.c test/prime_gen_test.h
+	gcc -g prime_gen.c test/prime_gen_test.c -o prime_gen_test
+
+test: prime_gen_test arith_utils_test congruences_test
+	./prime_gen_test
+	./arith_utils_test
+	./congruences_test
+
+clean:
+	rm -f prime_gen_test.exe arith_utils_test.exe congruences_test.exe
 	

data/ext/congruence_solver/arith_utils.c

@@ -1,136 +1,136 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "prime_gen.h"
-#include "arith_utils.h"
-
-//Expects 0 <= x,y < mod
-int mod_sum(int x, int y, int mod){
-  if(y >= mod - x){
-    return y - (mod - x);
-  }
-
-  else{
-    return y + x;
-  }
-}
-
-
-int mod_inv(int n, int mod){
-  int y, a;
-
-  if(n!=0){
-
-    while(n<0){
-      n+=mod;
-    }
-
-    for(y = 1; y < mod; y++){
-      a = mod_product(y, n, mod);
-
-      if(a == 1){
-        return y;
-      }
-    }
-  }
-
-  return 0;
-}
-
-
-int coprime(int n1, int n2){
-  //naive algorithm but efficient when n1 has already been factorized
-  int * n1Factors = prime_factors(n1);
-  int numOfFactors = *n1Factors;
-  int * factors = n1Factors+1;
-  int shareFactor = 0;
-  int i;
-
-  for(i=0; i<numOfFactors; i++){
-    if(n2 % factors[i] == 0){
-      shareFactor = 1;
-      break;
-    }
-  }
-
-  free(n1Factors);
-
-  return !shareFactor;
-}
-
-
-int mod_product(int num1, int num2, int mod){
-  int prod = 0;
-  int i;
-
-  for(i = 0; i < num1; i++){
-    prod = mod_sum(prod, num2, mod);
-  }
-
-  return prod;
-}
-
-//expects 0 <= n < mod
-int mod_power(int n, int power, int mod){
-  int product = n;
-  int i;
-
-  for(i = 1; i < power; i++){
-    product = mod_product(product, n, mod);
-  }
-
-  return product;
-}
-
-
-int totient(int n){
-  int * divisorList = prime_factors(n);
-  int listLength = divisorList[0];
-  int * divisors = divisorList+1;
-  int i;
-
-  for(i = 0; i < listLength; i++){
-    n *= (divisors[i] - 1);
-    n /= divisors[i];
-  }
-
-  free(divisorList);
-
-  return n;
-}
-
-
-
-
-int mod_eval_polynomial(int degree, int coeffs[], int mod, int x){
-	int tot = coeffs[degree];
-	int i;
-
-	for(i = degree - 1; i >= 0; i--){
-		tot = mod_product(tot, x, mod);
-		tot = mod_sum(tot, coeffs[i], mod);
-	}
-
-	return tot;
-}
-
-
-long  eval_polynomial(int degree, int coeffs[], int x){
-  long int sum = coeffs[0];
-   long int powx;
-  int i;
-
-  for(i = 1, powx = x; i <= degree; i++, powx*=x){
-    sum += powx*coeffs[i];
-  }
-
-  return sum;
-}
-
-
-
-
-/*
-int * linear_diophantine_solution(int order, int coeffs[], int scal){
-
-*=}
+#include <stdio.h>
+#include <stdlib.h>
+#include "prime_gen.h"
+#include "arith_utils.h"
+
+//Expects 0 <= x,y < mod
+int mod_sum(int x, int y, int mod){
+	if(y >= mod - x){
+		return y - (mod - x);
+	}
+
+	else{
+		return y + x;
+	}
+}
+
+
+int mod_inv(int n, int mod){
+	int y, a;
+
+	if(n!=0){
+
+		while(n<0){
+			n+=mod;
+		}
+
+		for(y = 1; y < mod; y++){
+			a = mod_product(y, n, mod);
+
+			if(a == 1){
+				return y;
+			}
+		}
+	}
+
+	return 0;
+}
+
+
+int coprime(int n1, int n2){
+	//naive algorithm but efficient when n1 has already been factorized
+	int * n1Factors = prime_factors(n1);
+	int numOfFactors = *n1Factors;
+	int * factors = n1Factors+1;
+	int shareFactor = 0;
+	int i;
+
+	for(i=0; i<numOfFactors; i++){
+		if(n2 % factors[i] == 0){
+			shareFactor = 1;
+			break;
+		}
+	}
+
+	free(n1Factors);
+
+	return !shareFactor;
+}
+
+
+int mod_product(int num1, int num2, int mod){
+	int prod = 0;
+	int i;
+
+	for(i = 0; i < num1; i++){
+		prod = mod_sum(prod, num2, mod);
+	}
+
+	return prod;
+}
+
+//expects 0 <= n < mod
+int mod_power(int n, int power, int mod){
+	int product = n;
+	int i;
+
+	for(i = 1; i < power; i++){
+		product = mod_product(product, n, mod);
+	}
+
+	return product;
+}
+
+
+int totient(int n){
+	int * divisorList = prime_factors(n);
+	int listLength = divisorList[0];
+	int * divisors = divisorList+1;
+	int i;
+
+	for(i = 0; i < listLength; i++){
+		n *= (divisors[i] - 1);
+		n /= divisors[i];
+	}
+
+	free(divisorList);
+
+	return n;
+}
+
+
+
+
+int mod_eval_polynomial(int degree, int coeffs[], int mod, int x){
+	int tot = coeffs[degree];
+	int i;
+
+	for(i = degree - 1; i >= 0; i--){
+		tot = mod_product(tot, x, mod);
+		tot = mod_sum(tot, coeffs[i], mod);
+	}
+
+	return tot;
+}
+
+
+long  eval_polynomial(int degree, int coeffs[], int x){
+	long int sum = coeffs[0];
+ 	long int powx;
+	int i;
+
+	for(i = 1, powx = x; i <= degree; i++, powx*=x){
+		sum += powx*coeffs[i];
+	}
+
+	return sum;
+}
+
+
+
+
+/*
+int * linear_diophantine_solution(int order, int coeffs[], int scal){
+
+*=}
 */

data/ext/congruence_solver/arith_utils.h

@@ -1,10 +1,10 @@
-#ifndef H_ARITH_UTILS
-#define H_ARITH_UTILS
-int mod_inv(int n, int mod);
-int mod_product(int n1, int n2, int mod);
-int mod_power(int n, int power, int mod);
-int mod_eval_polynomial(int degree, int coeffs[], int mod, int x);
-long eval_polynomial(int degree, int coeffs[], int x);
-int coprime(int n1, int n2);
-int totient(int n);
+#ifndef H_ARITH_UTILS
+#define H_ARITH_UTILS
+int mod_inv(int n, int mod);
+int mod_product(int n1, int n2, int mod);
+int mod_power(int n, int power, int mod);
+int mod_eval_polynomial(int degree, int coeffs[], int mod, int x);
+long eval_polynomial(int degree, int coeffs[], int x);
+int coprime(int n1, int n2);
+int totient(int n);
 #endif