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

Branches - Emily Ball #47

Open
wants to merge 3 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
24 changes: 20 additions & 4 deletions lib/fibonacci.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,24 @@
# Improved Fibonacci

# Time Complexity - ?
# Space Complexity - ? (should be O(n))
# Time Complexity - ?
# Space Complexity - ? O(n)
# Hint, you may want a recursive helper method
def fibonacci(n)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍



def fib_helper(solutions, current, n)
raise ArgumentError.new("negative input") if n < 0
return n if n == 0 || n == 1

if current == n
return solutions[0] + solutions[1]
end

temp = solutions[0]
solutions[0] = solutions[1]
solutions[1] = temp + solutions[1]
Comment on lines +15 to +17

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes!


return fib_helper(solutions, current + 1, n)
end

def fibonacci(n)
return fib_helper([0, 1], 2, n)
end
32 changes: 23 additions & 9 deletions lib/super_digit.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,29 @@
# Superdigit

# Time Complexity - ?
# Space Complexity - ?
# Time Complexity - O(n)
# Space Complexity - O(n)
Comment on lines +3 to +4

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where n is the number of digits


def digit_sum(n, sum = 0)
return n if n < 10

n.to_s.each_char { |num| sum += num.to_i }
return sum
end

def super_digit(n)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍


return n if n < 10
return super_digit(digit_sum(n))
end


# Time Complexity - ?
# Space Complexity - ?
def refined_super_digit(n, k)

end

# Time Complexity - O(n)
# Space Complexity - O(n)
def refined_super_digit(n, k, i = 0)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

return n if n < 10

sum = digit_sum(n)
sum *= k if i == 0
i += 1

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you really need i.


return super_digit(sum)
end
4 changes: 2 additions & 2 deletions test/super_digit_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require_relative "test_helper"

xdescribe "super_digit" do
describe "super_digit" do
it "will return 2 for super_digit(9875)" do
# Act
answer = super_digit(9875)
Expand All @@ -15,7 +15,7 @@

# Assert
expect(answer).must_equal 5
end
end

it "will return 6 for super_digit(123)" do
# Act
Expand Down
2 changes: 1 addition & 1 deletion test/test_helper.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'minitest'
require 'minitest/autorun'
require 'minitest/reporters'
require "minitest/skip_dsl"
# require "minitest/skip_dsl"

Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new

Expand Down