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 - Julia Bouvier #31

Open
wants to merge 5 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
19 changes: 18 additions & 1 deletion lib/problems.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,24 @@
# Time Complexity: ?
# Space Complexity: ?
def balanced(string)
raise NotImplementedError, "Not implemented yet"
stack = Stack.new
pairs = {
')'=> '(',
'}'=> '{',
']'=> '['
}

string.each_char do |char|
if pairs.values.include?(char)
stack.push(char)
else
return false if stack.empty?
removed = stack.pop
return false unless removed == pairs[char]
end
end

stack.empty? ? true : false
end

# Time Complexity: ?
Expand Down
40 changes: 33 additions & 7 deletions lib/queue.rb
Original file line number Diff line number Diff line change
@@ -1,31 +1,57 @@
class Queue

def initialize
# @store = ...
raise NotImplementedError, "Not yet implemented"
@store = Array.new(30)
@front = @back = -1
end

def enqueue(element)

Choose a reason for hiding this comment

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

👍

raise NotImplementedError, "Not yet implemented"
if @front == -1 && @back == -1
@front = 0
@back = 0
end

if ((@back + 1) % @store.length) == @front
raise ArgumentError.new "Queue is full"
end

@store[@back] = element
@back = (@back + 1) % @store.length
end

def dequeue
raise NotImplementedError, "Not yet implemented"
if @front == @back
raise ArgumentError.new "Queue is full"
end

temp = @store[@front]
@store[@front] = nil
@front = (@front + 1) % @store.length

Choose a reason for hiding this comment

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

At this point you also need to check to see if @front == @back and if so, the queue is empty now and you need to reset them to -1.

return temp
end

def front
raise NotImplementedError, "Not yet implemented"
return @store[@front]
end

def size
raise NotImplementedError, "Not yet implemented"
if @back.length > @front.length
return @back.length - @front.length
else
return @front.length - @back.length
end
Comment on lines +38 to +42

Choose a reason for hiding this comment

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

back and front are numbers, how would they have lengths?

end

def empty?
raise NotImplementedError, "Not yet implemented"
@front == @back? true : false
end

def to_s

Choose a reason for hiding this comment

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

👍

if @front < @back
@store = @store[@front...@back]
elsif @front != @back
@store = @store[@back..-1] + @store[@front...@back]
end
return @store.to_s
end
end
13 changes: 8 additions & 5 deletions lib/stack.rb
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
require 'linked_list'

class Stack
def initialize
# @store = ...
raise NotImplementedError, "Not yet implemented"
@store = LinkedList.new
end

def push(element)
raise NotImplementedError, "Not yet implemented"
@store.add_last(element)
return @store
end

def pop
raise NotImplementedError, "Not yet implemented"
return nil if @store.get_first.nil?
return @store.remove_last
end

def empty?
raise NotImplementedError, "Not yet implemented"
return true if @store.get_first.nil?
end

def to_s
Expand Down
5 changes: 0 additions & 5 deletions test/problems_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,25 @@
describe "Test wave 3 problems" do
describe "balanced" do
it "Given balanced strings it should return true" do
skip
expect(balanced('(({}))')).must_equal true
end

it "regards an empty string as balanced" do
skip
expect(balanced('')).must_equal true
end

it "will return false for an unbalanced set of parens" do
skip
expect(balanced('(()')).must_equal false
expect(balanced('(()}')).must_equal false
expect(balanced('([]]')).must_equal false
end

it "also works for {} and []" do
skip
expect(balanced('[]')).must_equal true
expect(balanced('{}')).must_equal true
end

it "also works if the string has opens and closes in the beginning and end" do
skip
expect(balanced('[]()')).must_equal true
end
end
Expand Down
10 changes: 1 addition & 9 deletions test/queue_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,12 @@
end

it "adds something to an empty Queue" do
skip
q = Queue.new
q.enqueue(10)
q.to_s.must_equal "[10]"
end

it "adds multiple somethings to a Queue" do
skip
q = Queue.new
q.enqueue(10)
q.enqueue(20)
Expand All @@ -27,13 +25,11 @@
end

it "starts the size of a Queue at 0" do
skip
q = Queue.new
q.empty?.must_equal true
end

it "removes something from the Queue" do
skip
q = Queue.new
q.enqueue(5)
removed = q.dequeue
Expand All @@ -42,7 +38,6 @@
end

it "removes the right something (LIFO)" do
skip
q = Queue.new
q.enqueue(5)
q.enqueue(3)
Expand All @@ -53,7 +48,6 @@
end

it "properly adjusts the size with enqueueing and dequeueing" do
skip
q = Queue.new
q.empty?.must_equal true
q.enqueue(-1)
Expand All @@ -65,7 +59,6 @@
end

it "returns the front element in the Queue" do
skip
q = Queue.new
q.enqueue(40)
q.enqueue(22)
Expand All @@ -92,7 +85,6 @@
q.enqueue(130)
q.enqueue(140)
q.enqueue(150)
q.enqueue(150)
q.enqueue(160)
q.enqueue(170)
q.enqueue(180)
Expand All @@ -101,6 +93,6 @@
q.enqueue(210)
q.dequeue

expect(q.to_s).must_equal('[40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 220, 230, 240]')
expect(q.to_s).must_equal('[40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210]')
end
end
5 changes: 0 additions & 5 deletions test/stack_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@
end

it "pushes something onto a empty Stack" do
skip
s = Stack.new
s.push(10)
s.to_s.must_equal "[10]"
end

it "pushes multiple somethings onto a Stack" do
skip
s = Stack.new
s.push(10)
s.push(20)
Expand All @@ -26,13 +24,11 @@
end

it "starts the stack empty" do
skip
s = Stack.new
s.empty?.must_equal true
end

it "removes something from the stack" do
skip
s = Stack.new
s.push(5)
removed = s.pop
Expand All @@ -41,7 +37,6 @@
end

it "removes the right something (LIFO)" do
skip
s = Stack.new
s.push(5)
s.push(3)
Expand Down