congruence_solver 0.3.1 → 0.3.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: congruence_solver
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -80,14 +80,14 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: "Provides a class (CongruenceSolver) for finding the modular zeros of
-  a \n                          polynomial (given the coefficients and modulus) and
-  a binary (csolve) to \n                          to solve your congruences at the
-  command line."
+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.
 email:
 - lane.barlow@gmail.com
 executables:
-- csolve.rb
+- csolve
 - setup
 extensions:
 - ext/congruence_solver/extconf.rb
@@ -102,10 +102,9 @@ files:
 - Rakefile
 - bench/bench_tools.rb
 - bench/solve_congruence_bm.rb
-- bin/csolve.rb
+- bin/csolve
 - bin/setup
 - congruence_solver.gemspec
-- ext/congruence_solver/.gitignore
 - ext/congruence_solver/Makefile
 - ext/congruence_solver/arith_utils.c
 - ext/congruence_solver/arith_utils.h
@@ -115,20 +114,16 @@ files:
 - ext/congruence_solver/extconf.rb
 - ext/congruence_solver/prime_gen.c
 - ext/congruence_solver/prime_gen.h
-- ext/congruence_solver/test/arith_utils_test.c
-- ext/congruence_solver/test/arith_utils_test.h
-- ext/congruence_solver/test/congruences_test.c
-- ext/congruence_solver/test/congruences_test.h
-- ext/congruence_solver/test/prime_gen_test.c
-- ext/congruence_solver/test/prime_gen_test.h
 - lib/congruence_solver.rb
 - lib/congruence_solver/version.rb
 - lib/polynomial_interpreter.rb
+- license.txt
 - spec/congruence_solver_spec.rb
 - spec/csolve_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/laneb/congruence_solver
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -146,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A gem for solving polynomial congruences.

data/ext/congruence_solver/.gitignore

@@ -1,2 +0,0 @@
-todo
-*.exe

data/ext/congruence_solver/test/arith_utils_test.c

@@ -1,106 +0,0 @@
-#include <stdio.h>
-#include "../arith_utils.h"
-#include "arith_utils_test.h"
-
-int main(){
-	int failures = 0;
-	int i;
-
-	for(i = 0; i < NUM_OF_MOD_INV_TESTS; i++){
-		failures += mod_inv_test(MOD_INV_NUMS[i], MOD_INV_MODS[i], MOD_INV_INVS[i]);
-	}
-	
-	for(i = 0; i < NUM_OF_MOD_PRODUCT_TESTS; i++){
-		failures += mod_product_test(MOD_PRODUCT_NUM_PAIRS[i], MOD_PRODUCT_MODS[i], MOD_PRODUCT_PRODUCTS[i]);
-	}
-
-	for(i = 0; i < NUM_OF_MOD_POWER_TESTS; i++){
-		failures += mod_power_test(MOD_POWER_NUMS[i], MOD_POWER_MODS[i], MOD_POWER_POWERS[i], MOD_POWER_EVALS[i]);
-	}
-	
-	for(i = 0; i < NUM_OF_COPRIME_TESTS; i++){
-		failures += coprime_test(COPRIME_NUM_PAIRS[i], COPRIME_EVALS[i]);
-	}
-
-	for(i = 0; i < NUM_OF_TOTIENT_TESTS; i++){
-		failures += totient_test(TOTIENT_NUMS[i], TOTIENT_EVALS[i]);
-	}
-
-	printf("%d functions failing in arith_utils.c\n\n", failures);
-	return failures;
-}
-
-
-int totient_test(int num, int tot){ 
-	int eval_totient = totient(num);
-
-	if(tot != eval_totient){
-		printf("Totient of %d incorrectly evaluated: %d given instead of %d.\n", 
-				num, eval_totient, tot);
-		return 1;
-	}
-
-	else{
-		return 0;
-	}
-}
-
-
-int coprime_test(int * pair, int isCoprime){
-	int evalCoprime = coprime(pair[0], pair[1]);
-
-	if(isCoprime && !evalCoprime){
-		printf("%d and %d incorrectly evaluated as not coprime.\n", 
-				pair[0], pair[1]);
-		return 1;
-	}
-
-	else if(!isCoprime && evalCoprime){
-		printf("%d and %d incorrectly evaluated as coprime.\n",
-				pair[0], pair[1]);
-		return 1;
-	}
-
-	else{
-		return 0;
-	}
-}
-
-
-int mod_power_test(int num, int mod, int pwr, int mdpwr){
-	int mdpwrEval = mod_power(num, pwr, mod);
-
-	if(mdpwrEval != mdpwr){
-		printf("Incorrect evaluation of %d^%d mod %d: %d instead of %d.\n", 
-				num, pwr, mod, mdpwrEval, mdpwr);
-		return 1;
-	}
-
-	return 0;
-}
-
-
-int mod_product_test(int * pair, int mod, int product){
-	int prod = mod_product(pair[0], pair[1], mod);
-
-	if(prod != product){
-		printf("Incorrect evaluation of %d*%d mod %d: %d instead of %d.\n", 
-				pair[0], pair[1], mod, prod, product);
-		return 1;
-	}
-
-	return 0;
-}
-
-
-int mod_inv_test(int num, int mod, int inv){
-	int invEval = mod_inv(num, mod);
-	
-	if(inv != invEval){
-		printf("Incorrect evaluation of %d^-1 mod %d: %d instead of %d.\n", num, mod, invEval, inv);
-		return 1;
-	}
-
-	return 0;
-}
-

data/ext/congruence_solver/test/arith_utils_test.h

@@ -1,25 +0,0 @@
-#define NUM_OF_MOD_INV_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
-#define NUM_OF_MOD_EVAL_POLYNOMIAL_TESTS 1
-
-int TOTIENT_NUMS[NUM_OF_TOTIENT_TESTS] = {1, 2, 3, 41, 125, 9400};
-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, 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, 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] = {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, 10};

data/ext/congruence_solver/test/congruences_test.c

@@ -1,78 +0,0 @@
-#include <stdio.h>
-#include "../congruences.h"
-#include "congruences_test.h"
-
-void print_polynomial_inline(int func_degree, int * func_coeffs);
-int solve_congruence_test(int func_degree, int * func_coeffs, int mod, int num_of_solutions, int * solutions);
-
-int main(){
-	int failures = 0;
-
-	failures += solve_congruence_test(POL_1_DEGREE, POL_1_COEFFS, POL_1_MOD, NUM_OF_POL_1_SOLS, POL_1_SOLS);
-	failures += solve_congruence_test(POL_2_DEGREE, POL_2_COEFFS, POL_2_MOD, NUM_OF_POL_2_SOLS, POL_2_SOLS);
-	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;
-}
-
-int int_array_cmp_func(const void * a, const void * b){
-	return *((int *)a) - *((int *) b);
-}
-
-int solve_congruence_test(int func_degree, int * func_coeffs, int mod, int num_of_solutions, int * solutions){
-	int * solutions_to_test = solve_congruence(func_degree, func_coeffs, mod);
-	int i, j;
-
-	qsort(solutions_to_test+1, solutions_to_test[0], sizeof(int), int_array_cmp_func);
-	qsort(solutions, num_of_solutions, sizeof(int), int_array_cmp_func);
-
-	if(num_of_solutions != solutions_to_test[0]){
-		printf("Incorrect number of solutions found for congruence ");
-		print_polynomial_inline(func_degree, func_coeffs);
-		printf(" = 0 (mod %d): %d given instead of %d.\n\n", mod, solutions_to_test[0], num_of_solutions);
-
-		printf("The following solutions were found: \n");
-		for(i = 0; i < solutions_to_test[0]; i++){
-			printf("(%d) %d\n", i, solutions_to_test[i+1]);
-		}
-
-		printf("\nwhere the actual solutions are\n\n");
-
-		for(i = 0; i < num_of_solutions; i++){
-			printf("(%d) %d\n", i, solutions[i]);
-		}
-
-		return 1;
-	}
-
-	for(i = 0; i < num_of_solutions; i++){
-		if(solutions[i] != solutions_to_test[i+1]){
-			printf("Incorrect %dth solution (after sorting) to congruence ", i);
-			
-			print_polynomial_inline(func_degree, func_coeffs);
-
-			printf(" = 0 (mod %d): %d given instead of %d.\n\n", mod, solutions_to_test[i+1], solutions[i]);
-
-			return 1;
-		}
-	}
-
-	printf("Correct number of solutions (%d) found for congruence ", num_of_solutions);
-	print_polynomial_inline(func_degree, func_coeffs);
-	printf(" = 0 (mod %d) without error.\n\n", mod);
-
-	return 0;
-}
-
-void print_polynomial_inline(int func_degree, int * func_coeffs){
-	int j;
-
-	for(j = func_degree; j >= 1; j--){
-		printf("%d*x^%d + ", func_coeffs[j], j);
-	}
-
-	printf("%d", func_coeffs[0]);
-}

data/ext/congruence_solver/test/congruences_test.h

@@ -1,239 +0,0 @@
-#define POL_1_DEGREE 4
-#define POL_1_COEFF_0 0
-#define POL_1_COEFF_1 9
-#define POL_1_COEFF_2 0
-#define POL_1_COEFF_3 2
-#define POL_1_COEFF_4 1
-#define POL_1_MOD 99
-#define NUM_OF_POL_1_SOLS 12
-#define POL_1_SOL_0 0
-#define POL_1_SOL_1 6
-#define POL_1_SOL_2 30
-#define POL_1_SOL_3 33
-#define POL_1_SOL_4 39
-#define POL_1_SOL_5 52
-#define POL_1_SOL_6 61
-#define POL_1_SOL_7 63
-#define POL_1_SOL_8 66
-#define POL_1_SOL_9 72
-#define POL_1_SOL_10 88
-#define POL_1_SOL_11 96
-
-
-#define POL_2_DEGREE 6
-#define POL_2_COEFF_0 -1
-#define POL_2_COEFF_1 0
-#define POL_2_COEFF_2 0
-#define POL_2_COEFF_3 0
-#define POL_2_COEFF_4 0
-#define POL_2_COEFF_5 0
-#define POL_2_COEFF_6 1
-#define POL_2_MOD 700
-#define NUM_OF_POL_2_SOLS 24
-#define POL_2_SOL_0 1
-#define POL_2_SOL_1 51
-#define POL_2_SOL_2 99
-#define POL_2_SOL_3 101
-#define POL_2_SOL_4 149
-#define POL_2_SOL_5 151
-#define POL_2_SOL_6 199
-#define POL_2_SOL_7 201
-#define POL_2_SOL_8 249
-#define POL_2_SOL_9 251
-#define POL_2_SOL_10 299
-#define POL_2_SOL_11 349
-#define POL_2_SOL_12 351
-#define POL_2_SOL_13 401
-#define POL_2_SOL_14 449
-#define POL_2_SOL_15 451
-#define POL_2_SOL_16 499
-#define POL_2_SOL_17 501
-#define POL_2_SOL_18 549
-#define POL_2_SOL_19 551
-#define POL_2_SOL_20 599
-#define POL_2_SOL_21 601
-#define POL_2_SOL_22 649
-#define POL_2_SOL_23 699
-
-#define POL_3_DEGREE 9
-#define POL_3_COEFF_0 -11
-#define POL_3_COEFF_1 0
-#define POL_3_COEFF_2 0
-#define POL_3_COEFF_3 3
-#define POL_3_COEFF_4 0
-#define POL_3_COEFF_5 0
-#define POL_3_COEFF_6 0
-#define POL_3_COEFF_7 0
-#define POL_3_COEFF_8 0
-#define POL_3_COEFF_9 10
-#define POL_3_MOD 49
-#define NUM_OF_POL_3_SOLS 0
-
-#define POL_4_DEGREE 2
-#define POL_4_COEFF_0 4
-#define POL_4_COEFF_1 -4
-#define POL_4_COEFF_2 1
-#define POL_4_MOD 5104
-#define NUM_OF_POL_4_SOLS 4
-#define POL_4_SOL_0 2
-#define POL_4_SOL_1 1278
-#define POL_4_SOL_2 2554
-#define POL_4_SOL_3 3830
-
-#define POL_5_DEGREE 11
-#define POL_5_COEFF_0 0
-#define POL_5_COEFF_1 2
-#define POL_5_COEFF_2 0
-#define POL_5_COEFF_3 0
-#define POL_5_COEFF_4 0
-#define POL_5_COEFF_5 0
-#define POL_5_COEFF_6 0
-#define POL_5_COEFF_7 0
-#define POL_5_COEFF_8 0
-#define POL_5_COEFF_9 0
-#define POL_5_COEFF_10 0
-#define POL_5_COEFF_11 1
-#define POL_5_MOD 401249
-#define NUM_OF_POL_5_SOLS 9
-#define POL_5_SOL_0 0
-#define POL_5_SOL_1 87850
-#define POL_5_SOL_2 101665
-#define POL_5_SOL_3 105867
-#define POL_5_SOL_4 193717
-#define POL_5_SOL_5 207532
-#define POL_5_SOL_6 295382
-#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, 
-									POL_1_COEFF_2, 
-									POL_1_COEFF_3, 
-									POL_1_COEFF_4};
-int POL_1_SOLS[NUM_OF_POL_1_SOLS] = {POL_1_SOL_0, 
-									 POL_1_SOL_1, 
-									 POL_1_SOL_2, 
-									 POL_1_SOL_3, 
-									 POL_1_SOL_4, 
-									 POL_1_SOL_5, 
-									 POL_1_SOL_6, 
-									 POL_1_SOL_7, 
-									 POL_1_SOL_8, 
-									 POL_1_SOL_9, 
-									 POL_1_SOL_10, 
-									 POL_1_SOL_11};
-
-int POL_2_COEFFS[POL_2_DEGREE+1] = {POL_2_COEFF_0, 
-									POL_2_COEFF_1, 
-									POL_2_COEFF_2, 
-									POL_2_COEFF_3, 
-									POL_2_COEFF_4, 
-									POL_2_COEFF_5, 
-									POL_2_COEFF_6};
-
-int POL_2_SOLS[NUM_OF_POL_2_SOLS] = {POL_2_SOL_0, 
-								  	 POL_2_SOL_1, 
-								  	 POL_2_SOL_2, 
-								  	 POL_2_SOL_3, 
-								  	 POL_2_SOL_4, 
-								  	 POL_2_SOL_5, 
-								  	 POL_2_SOL_6, 
-								  	 POL_2_SOL_7, 
-									 POL_2_SOL_8, 
-									 POL_2_SOL_9, 
-									 POL_2_SOL_10, 
-									 POL_2_SOL_11, 
-									 POL_2_SOL_12, 
-									 POL_2_SOL_13, 
-									 POL_2_SOL_14, 
-									 POL_2_SOL_15, 
-									 POL_2_SOL_16, 
-									 POL_2_SOL_17, 
-									 POL_2_SOL_18, 
-									 POL_2_SOL_19, 
-									 POL_2_SOL_20, 
-									 POL_2_SOL_21, 
-									 POL_2_SOL_22,
-									 POL_2_SOL_23};
-
-int POL_3_COEFFS[POL_3_DEGREE+1] = {POL_3_COEFF_0,
-									POL_3_COEFF_1,
-									POL_3_COEFF_2,
-									POL_3_COEFF_3,
-									POL_3_COEFF_4,
-									POL_3_COEFF_5,
-									POL_3_COEFF_6,
-									POL_3_COEFF_7,
-									POL_3_COEFF_8,
-									POL_3_COEFF_9
-									};
-
-int * POL_3_SOLS = NULL;
-
-int POL_4_COEFFS[POL_4_DEGREE+1] = {POL_4_COEFF_0,
-									POL_4_COEFF_1,
-									POL_4_COEFF_2};
-
-int POL_4_SOLS[NUM_OF_POL_4_SOLS] = {POL_4_SOL_0,
-									POL_4_SOL_1,
-									POL_4_SOL_2,
-									POL_4_SOL_3};
-
-int POL_5_COEFFS[POL_5_DEGREE+1] = {POL_5_COEFF_0,
-									POL_5_COEFF_1,
-									POL_5_COEFF_2,
-									POL_5_COEFF_3,
-									POL_5_COEFF_4,
-									POL_5_COEFF_5,
-									POL_5_COEFF_6,
-									POL_5_COEFF_7,
-									POL_5_COEFF_8,
-									POL_5_COEFF_9,
-									POL_5_COEFF_10,
-									POL_5_COEFF_11};
-
-int POL_5_SOLS[NUM_OF_POL_5_SOLS] = {POL_5_SOL_0,
-									POL_5_SOL_1,
-									POL_5_SOL_2,
-									POL_5_SOL_3,
-									POL_5_SOL_4,
-									POL_5_SOL_5,
-									POL_5_SOL_6,
-									POL_5_SOL_7,
-									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/ext/congruence_solver/test/prime_gen_test.c

@@ -1,83 +0,0 @@
-#include <stdio.h>
-#include "../prime_gen.h"
-#include "prime_gen_test.h"
-
-
-
-int main(){
-  int failures = 0;
-  int i;
-  int * prime_ary_to_test = primes_upto(MAX_PRIME_FOR_PRIMES_UPTO_TEST)+1;
-
-  for(i=0; PRIME_ARY[i] <= MAX_PRIME_FOR_PRIMES_UPTO_TEST; i++){
-    if(PRIME_ARY[i] != prime_ary_to_test[i]){
-      printf("%dth prime incorrect: %d given instead of %d.\n\n", i, prime_ary_to_test[i], PRIME_ARY[i]);
-      failures += 1;
-    }
-  }
-
-  printf("Primes up to %d generated without error.\n\n", MAX_PRIME_FOR_PRIMES_UPTO_TEST);
-
-  prime_ary_to_test = primes(LIST_LENGTH_FOR_PRIMES_TEST);
-
-  for(i = 0; i < LIST_LENGTH_FOR_PRIMES_TEST; i++){
-    if(PRIME_ARY[i] != prime_ary_to_test[i]){
-      printf("%dth prime incorrect: %d given instead of %d.\n\n", i, prime_ary_to_test[i], PRIME_ARY[i]);
-      failures += 1;
-    }
-  }
-
-  printf("First %d primes generated without error.\n\n", LIST_LENGTH_FOR_PRIMES_TEST);
- 
-  //Due to the implementation of prime generation and calculation of a maximum divisor
-  //2 (and 3, for the same reason) arises as a corner case
-  failures += prime_factors_test(2, FACTORS_OF_2, 1);
-
-  //Factorization of a prime should return an array containig a 1 followed by the prime itself.
-  failures += prime_factors_test(PRIME_TO_FACTOR, FACTORS_OF_PRIME, 1);
-
-  //Factorization of a  composite should return an array containing the number of factors and the 
-  //followed by the factors. 
-  failures += prime_factors_test(SMALL_COMPOSITE, FACTORS_OF_SMALL_COMPOSITE, NUM_OF_SMALL_COMPOSITE_FACTORS);
-
-  //Factorization of composites with factors to powers greater than 1 should still only list each factor once.
-  failures += prime_factors_test(COMPOSITE_WITH_REPEATED_FACTORS, REPEATED_FACTORS, NUM_OF_REPEATED_FACTORS); 
-
-  //Original implementation ran took several minutes to generate the primes necessary
-  //to factor large numbers.
-  printf("Beginning to factor a large composite number (%d). A stall here would indicate slow execution.\n",
-          LARGE_COMPOSITE);
-  failures += prime_factors_test(LARGE_COMPOSITE, FACTORS_OF_LARGE_COMPOSITE, NUM_OF_LARGE_COMPOSITE_FACTORS);
-
-  //Optimized implementation leverages the least prime factor (once discovered) to minimize the amount of prime generation necessary
-  //This method will still falter somewhat when the smallest prime factors are large.
-  printf("Beginning to factor a composite with no small prime factors (%d). A stall here would indicate slow execution.\n",
-          COMPOSITE_WITH_LARGE_FACTORS);
-  failures += prime_factors_test(COMPOSITE_WITH_LARGE_FACTORS, LARGE_FACTORS, NUM_OF_LARGE_FACTORS);
-
-  return failures;
-}
-
-
-int prime_factors_test(int num, int * expected_factors, int num_of_expected_factors){
-  int * factor_list = prime_factors(num);
-  int i;
-
-  if(factor_list[0] != num_of_expected_factors){
-    printf("Incorrect factorization of prime %d: %d factors given instead of %d.\n\n", num, factor_list[0], num_of_expected_factors);
-    return 1;
-  }
-
-  else{
-    for(i = 0; i < num_of_expected_factors; i++){
-      if(factor_list[i+1] != expected_factors[i]){
-        printf("Incorrect 0th factor of %d: %d given.\n\b", num, factor_list[1]);
-        return 1;
-      }
-    }
-  }
-
-  printf("%d factored correctly.\n\n", num);
-
-  return 0;
-}