Module:JI ratio finder: Difference between revisions

← Older edit Newer edit →

@@ Line 63: / Line 63: @@
 -- Ratios found this way will range from 0 cents to the given cent value.
 -- These ratios should then be filtered as needed.
-function p.find_candidate_ratios(cents, denominator_limit, prime_limit)
+function p.find_candidate_ratios(cents, int_limit, prime_limit)
-	local cents = cents or 1200
+	local cents = cents or 1902
-	local denominator_limit = denominator_limit or 99
+	local int_limit = int_limit or 99
 	local prime_limit = prime_limit or 97
 	local candidate_ratios = {}
-	for i = 1, denominator_limit do
+	for i = 1, int_limit do
-		local denominator = i
+		for j = i, int_limit do
-		local numerator = i
+			local numerator = j
-		local is_within_cents = true
+			local denominator = i
-		repeat
-			local current_ratio = rat.new(numerator, denominator)
-			local is_simplified = utils._gcd(numerator, denominator) == 1
-			local is_within_prime_limit = rat.max_prime(current_ratio) <= prime_limit
-			is_within_cents = rat.cents(current_ratio) <= cents
-			if is_simplified and is_within_cents and is_within_prime_limit then
+			-- Proceed if ratio is simplified
-				table.insert(candidate_ratios, current_ratio)
+			if utils._gcd(numerator, denominator) == 1 then
+				local current_ratio = rat.new(numerator, denominator)
+				local is_within_prime_limit = rat.max_prime(current_ratio) <= prime_limit
+				local is_within_cents = rat.cents(current_ratio) <= cents
+				if is_within_cents and is_within_prime_limit then
+					table.insert(candidate_ratios, current_ratio)
+				end
 			end
+		end
-			numerator = numerator + 1
-		until not is_within_cents
 	end
@@ Line 96: / Line 95: @@
 -- within a prime subgroup.
 -- These ratios should be filtered as needed.
-function p.find_candidate_ratios_within_subgroup(cents, denominator_limit, subgroup)
+function p.find_candidate_ratios_within_subgroup(cents, int_limit, subgroup)
 	local cents = cents or 1200
-	local denominator_limit = denominator_limit or 99
+	local int_limit = int_limit or 99
 	local subgroup = subgroup or { 2, 3, 7, 11 }
 	local candidate_ratios = {}
-	for i = 1, denominator_limit do
+	for i = 1, int_limit do
-		local denominator = i
+		for j = i, int_limit do
-		local numerator = i
+			local numerator = j
-		local is_within_cents = true
+			local denominator = i
-		repeat
-			local current_ratio = rat.new(numerator, denominator)
-			local is_simplified = utils._gcd(numerator, denominator) == 1
-			local is_within_subgroup = p.within_subgroup(current_ratio, subgroup)
-			is_within_cents = rat.cents(current_ratio) <= cents
-			if is_simplified and is_within_cents and is_within_subgroup then
+			-- Proceed if ratio is simplified
-				table.insert(candidate_ratios, current_ratio)
+			if utils._gcd(numerator, denominator) == 1 then
+				local current_ratio = rat.new(numerator, denominator)
+				local is_within_subgroup = p.within_subgroup(current_ratio)
+				local is_within_cents = rat.cents(current_ratio) <= cents
+				if is_within_cents and is_within_subgroup then
+					table.insert(candidate_ratios, current_ratio)
+				end
 			end
+		end
-			numerator = numerator + 1
-		until not is_within_cents
 	end