Addie's List Implementations

lib/array_list.rb

@@ -2,26 +2,76 @@
 
 class ArrayList
   def initialize
-    @storage = []
+    #pretend @storage is a native array: fixed size, indexing only (no dot methods)
+    #so we have the capacity to store 10 values but size should be zero right now
+    #fixed size = fixed capacity. size is how much is in there at the time
+    @storage = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+    @size = 0
   end
 
   # Adds _value_ at the end of the list
   def add(value)
+    #raise some error if @size == @storage.length
+    @storage[@size] = value
+    @size += 1
+  end
+
+  def add_in_order(value)
+    @size.downto(0) do |i|
+      if i == 0 || @storage[i-1] <= value
+        @storage[i] = value
+        break
+      else
+        @storage[i] = @storage[i-1]
+      end
+    end
+    @size += 1
   end
 
   # Deletes the _last_ value in the array
   def delete
+    # raise some error if @size == 0
+    # @storage[@size] = 0 #probs don't need this
+    @size -= 1
   end
 
   def include?(key)
+    @size.times do |i|
+      return true if @storage[i] == key
+    end
+    return false
   end
 
   def size
+    return @size
   end
 
   def max
+    #raise some error if @size == 0
+    max = @storage[0]
+    @size.times do |i|
+      max = @storage[i] if @storage[i] > max
+    end
+    return max
+  end
+
+  def remove_all(num)
+    shift_count = 0
+    @size.times do |i|
+      if @storage[i] == num
+        shift_count += 1
+      else
+        @storage[i - shift_count] = @storage[i]
+      end
+    end
+    @size -= shift_count
   end
 
   def to_s
+    str = ""
+    @size.times do |i|
+      str += @storage[i].to_s + ", "
+    end
+    return "[#{str[0..-3]}]"
   end
 end

lib/linked_list.rb

@@ -31,6 +31,27 @@ def add(value)
     self
   end
 
+  def add_in_order(value)
+    if @size == 0
+      @head = Node.new(value)
+    elsif value < @head.data
+      @head = Node.new(value, @head)
+    else
+      current = @head
+      loop do
+        if current.next == nil
+          current.next = Node.new(value)
+          break
+        elsif current.next.data >= value
+          current.next = Node.new(value, current.next)
+          break
+        end
+        current = current.next
+      end
+    end
+    @size += 1
+  end
+
   def delete(val)
     return nil if @size == 0
     if @head.data == val
@@ -57,12 +78,29 @@ def delete(val)
 
 
   def include?(key)
+    current = @head
+    while current != nil
+      return true if current.data == key
+      current = current.next
+    end
+    return false
   end
 
   def size
+    return @size
   end
 
   def max
+    return nil if @size == 0
+    current = @head
+    max = current.data
+    while current != nil
+      if current.data > max
+        max = current.data
+      end
+      current = current.next
+    end
+    return max
   end
 
   def to_s

lib/lotto.rb

@@ -7,7 +7,7 @@ def initialize
     while @ticket.size < 5
       auto_num = rand(55) + 1
       if [email protected]?(auto_num)
-        @ticket.add(auto_num)
+        @ticket.add_in_order(auto_num)
       end
     end
   end