Module:Simplified fraction: Difference between revisions

← Older edit

@@ Line 1: / Line 1: @@
 local p = {}
-local rat = require("Module:Rational")
-function p.refrac(frame)
+local function simplify(n, d)
+	local a = math.max(n, d)
+	local b = math.min(n, d)
+	local g = 1
+	while b ~= 0 do
+		g = a % b
+		a = b
+		b = g
+	end
+	return math.floor(n / a), math.floor(d / a)
+end
+function p.simfrac(frame)
 	local n = frame.args["n"]
 	local d = frame.args["d"]
-	local num, denom = rat.as_pair(rat.new(n, d)) -- hopefully this reduces the numbers
+	local mixed = frame.args["mixed"] == "true" and true or false
-	local whole = frame.args["mixed"] and math.floor(num / denom) or 0
+	local num, denom = simplify(n, d)
-	local ft = (whole ~= 0 and string.format("{{frac|%d|%d|%d}}", whole, num - whole * denom, denom) or string.format("{{frac|%d|%d}}", num, denom))
+	local whole = mixed and math.floor(num / denom) or 0
+	local ft
+	if denom == 1 then
+		ft = string.format("%d", num)
+	elseif whole ~= 0 then
+		ft = string.format("%d %d⁄%d", whole, num - whole * denom, denom)
+	else
+		ft = string.format("%d⁄%d", num, denom)
+	end
 	return frame:preprocess(ft)
 end
+return p