Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add continued fraction representation of a rational. #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 38 additions & 9 deletions lib/ratio.ex
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,13 @@ defmodule Ratio do

Use `Ratio.<|>/2` or `Ratio.new/2` instead.
"""
defstruct numerator: 0, denominator: 1
@type t :: %Ratio{numerator: integer(), denominator: pos_integer()}
defstruct continued_fraction_representation: nil, numerator: 0, denominator: 1

@type t :: %Ratio{
continued_fraction_representation: nil | list(integer()),
numerator: integer(),
denominator: pos_integer()
}

@doc """
Check to see whether something is a ratioal struct.
Expand Down Expand Up @@ -283,7 +288,14 @@ defmodule Ratio do
-5 <|> 3
"""
def minus(%Ratio{numerator: numerator, denominator: denominator}) do
%Ratio{numerator: Kernel.-(numerator), denominator: denominator}
{continued_fraction, _} =
get_continued_fraction_representation(Kernel.-(numerator), denominator)

%Ratio{
numerator: Kernel.-(numerator),
denominator: denominator,
continued_fraction_representation: continued_fraction
}
end

@doc """
Expand Down Expand Up @@ -502,14 +514,19 @@ defmodule Ratio do
defp simplify(rational)

defp simplify(%Ratio{numerator: numerator, denominator: denominator}) do
gcdiv = gcd(numerator, denominator)
{continued_fraction, gcdiv} = get_continued_fraction_representation(numerator, denominator)
new_denominator = Kernel.div(denominator, gcdiv)
{new_denominator, numerator} = normalize_denom_num(new_denominator, numerator)

# if new_denominator == 1 do
# Kernel.div(numerator, gcdiv)
# else
%Ratio{numerator: Kernel.div(numerator, gcdiv), denominator: new_denominator}
%Ratio{
continued_fraction_representation: continued_fraction,
numerator: Kernel.div(numerator, gcdiv),
denominator: new_denominator
}

# end
end

Expand All @@ -521,11 +538,23 @@ defmodule Ratio do
end
end

# Calculates the Greatest Common denominator of two numbers.
defp gcd(a, 0), do: abs(a)
# Returns the continued fraction representation of a rational with 'a' being it's numerator and 'b' being it's denominator, along with Greatest Common Divisor of 'a' and 'b'.
def get_continued_fraction_representation(a, b) do
sign = sign(a) * sign(b)
{continued_fraction, gcdiv} = get_continued_fraction_representation(a, b, 0)
{[sign | continued_fraction], gcdiv}
end

defp gcd(0, b), do: abs(b)
defp gcd(a, b), do: gcd(b, Kernel.rem(a, b))
defp get_continued_fraction_representation(a, 0, _depth), do: {[], abs(a)}
defp get_continued_fraction_representation(0, b, _depth), do: {[0], abs(b)}

defp get_continued_fraction_representation(a, b, depth) do
{continued_fraction, gcdiv} =
get_continued_fraction_representation(b, Kernel.rem(a, b), depth + 1)

sign = if rem(depth, 2) == 0, do: 1, else: -1
{[sign * Kernel.div(a, b) | continued_fraction], gcdiv}
end

@doc """
Rounds a number (rational, integer or float) to the largest whole number less than or equal to num.
Expand Down
6 changes: 5 additions & 1 deletion test/ratio/float_conversion_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ defmodule Ratio.FloatConversionTest do
# use Ratio coerces negative floats to Ratios, so the below test needs to be run outside the Ratio.FloatConversion
# module.
test "float conversion for negative numbers" do
assert %Ratio{numerator: -2_476_979_795_053_773, denominator: 2_251_799_813_685_248} ==
assert %Ratio{
numerator: -2_476_979_795_053_773,
denominator: 2_251_799_813_685_248,
continued_fraction_representation: [-1, -1, 9, -1, 112_589_990_684_261, -2]
} ==
Ratio.FloatConversion.float_to_rational(-1.1)
end
end
18 changes: 17 additions & 1 deletion test/ratio_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ defmodule RatioTest do
doctest Ratio.FloatConversion

test "definition of <|> operator" do
assert 1 <|> 3 == %Ratio{numerator: 1, denominator: 3}
assert 1 <|> 3 == %Ratio{
numerator: 1,
denominator: 3,
continued_fraction_representation: [1, 0, -3]
}
end

test "reject _ <|> 0" do
Expand Down Expand Up @@ -47,6 +51,18 @@ defmodule RatioTest do
refute Ratio.equal?(1 <|> 3, 1 <|> 4)
end

test "implicit comparison operators" do
assert 1 <|> 2 > 1 <|> 3
assert -1 <|> 2 < 1 <|> 3
assert 1 <|> 2 > -1 <|> 3
assert -1 <|> 2 < -1 <|> 3

assert Ratio.new(-2.3) > Ratio.new(-5.1)
assert Ratio.new(2.3) > Ratio.new(-5.1)
assert Ratio.new(-2.3) < Ratio.new(5.1)
assert Ratio.new(2.3) < Ratio.new(5.1)
end

test "small number precision" do
assert Ratio.equal?(
Ratio.new(1.602177e-19),
Expand Down