From a60547d9d94bc90913dfae0577023abdadc0450c Mon Sep 17 00:00:00 2001 From: Caroline Vurlumis Date: Tue, 17 Jul 2018 21:24:09 -0700 Subject: [PATCH 1/4] in progress --- .../01-introduction-to-data-structures/line/line.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/01-data-structures/01-introduction-to-data-structures/line/line.rb b/01-data-structures/01-introduction-to-data-structures/line/line.rb index 84bfe59e..fc62c1ba 100644 --- a/01-data-structures/01-introduction-to-data-structures/line/line.rb +++ b/01-data-structures/01-introduction-to-data-structures/line/line.rb @@ -9,26 +9,33 @@ def initialize end def join(person) + members.push(person) end def leave(person) + members.delete(person) end def front + members.first end def middle + members[((members.count).floor/2)] end def back + members.last end def search(person) + members.include?(person) end private def index(person) + members.index(person) end -end \ No newline at end of file +end From d5359bf1514706f61ca490fa0b303248561fdd95 Mon Sep 17 00:00:00 2001 From: Caroline Vurlumis Date: Wed, 18 Jul 2018 22:30:17 -0700 Subject: [PATCH 2/4] updated line.rb, fixed rspec --- 01-data-structures/.rspec | 1 + .../line/line.rb | 4 +- .../line => spec}/line_spec.rb | 4 +- .../screen => spec}/screen_spec.rb | 2 +- 01-data-structures/spec/spec_helper.rb | 100 ++++++++++++++++++ 5 files changed, 106 insertions(+), 5 deletions(-) create mode 100644 01-data-structures/.rspec rename 01-data-structures/{01-introduction-to-data-structures/line => spec}/line_spec.rb (94%) rename 01-data-structures/{01-introduction-to-data-structures/screen => spec}/screen_spec.rb (93%) create mode 100644 01-data-structures/spec/spec_helper.rb diff --git a/01-data-structures/.rspec b/01-data-structures/.rspec new file mode 100644 index 00000000..c99d2e73 --- /dev/null +++ b/01-data-structures/.rspec @@ -0,0 +1 @@ +--require spec_helper diff --git a/01-data-structures/01-introduction-to-data-structures/line/line.rb b/01-data-structures/01-introduction-to-data-structures/line/line.rb index fc62c1ba..befdd52e 100644 --- a/01-data-structures/01-introduction-to-data-structures/line/line.rb +++ b/01-data-structures/01-introduction-to-data-structures/line/line.rb @@ -21,7 +21,7 @@ def front end def middle - members[((members.count).floor/2)] + members[(members.count/2)] end def back @@ -29,7 +29,7 @@ def back end def search(person) - members.include?(person) + members.include?(person) ? person:nil end private diff --git a/01-data-structures/01-introduction-to-data-structures/line/line_spec.rb b/01-data-structures/spec/line_spec.rb similarity index 94% rename from 01-data-structures/01-introduction-to-data-structures/line/line_spec.rb rename to 01-data-structures/spec/line_spec.rb index b755dabb..0176d407 100644 --- a/01-data-structures/01-introduction-to-data-structures/line/line_spec.rb +++ b/01-data-structures/spec/line_spec.rb @@ -1,6 +1,6 @@ include RSpec -require_relative 'line' +require_relative '../01-introduction-to-data-structures/line/line' RSpec.describe Line, type: Class do let(:line) { Line.new } @@ -59,4 +59,4 @@ end end -end \ No newline at end of file +end diff --git a/01-data-structures/01-introduction-to-data-structures/screen/screen_spec.rb b/01-data-structures/spec/screen_spec.rb similarity index 93% rename from 01-data-structures/01-introduction-to-data-structures/screen/screen_spec.rb rename to 01-data-structures/spec/screen_spec.rb index f05becb2..e1ed5ae9 100644 --- a/01-data-structures/01-introduction-to-data-structures/screen/screen_spec.rb +++ b/01-data-structures/spec/screen_spec.rb @@ -1,4 +1,4 @@ -require_relative 'screen' +require_relative '../01-introduction-to-data-structures/screen/pixel' RSpec.describe Screen, type: Class do let(:screen) { Screen.new(10, 10) } diff --git a/01-data-structures/spec/spec_helper.rb b/01-data-structures/spec/spec_helper.rb new file mode 100644 index 00000000..251aa510 --- /dev/null +++ b/01-data-structures/spec/spec_helper.rb @@ -0,0 +1,100 @@ +# This file was generated by the `rspec --init` command. Conventionally, all +# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`. +# The generated `.rspec` file contains `--require spec_helper` which will cause +# this file to always be loaded, without a need to explicitly require it in any +# files. +# +# Given that it is always loaded, you are encouraged to keep this file as +# light-weight as possible. Requiring heavyweight dependencies from this file +# will add to the boot time of your test suite on EVERY test run, even for an +# individual file that may not need all of that loaded. Instead, consider making +# a separate helper file that requires the additional dependencies and performs +# the additional setup, and require it from the spec files that actually need +# it. +# +# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration +RSpec.configure do |config| + # rspec-expectations config goes here. You can use an alternate + # assertion/expectation library such as wrong or the stdlib/minitest + # assertions if you prefer. + config.expect_with :rspec do |expectations| + # This option will default to `true` in RSpec 4. It makes the `description` + # and `failure_message` of custom matchers include text for helper methods + # defined using `chain`, e.g.: + # be_bigger_than(2).and_smaller_than(4).description + # # => "be bigger than 2 and smaller than 4" + # ...rather than: + # # => "be bigger than 2" + expectations.include_chain_clauses_in_custom_matcher_descriptions = true + end + + # rspec-mocks config goes here. You can use an alternate test double + # library (such as bogus or mocha) by changing the `mock_with` option here. + config.mock_with :rspec do |mocks| + # Prevents you from mocking or stubbing a method that does not exist on + # a real object. This is generally recommended, and will default to + # `true` in RSpec 4. + mocks.verify_partial_doubles = true + end + + # This option will default to `:apply_to_host_groups` in RSpec 4 (and will + # have no way to turn it off -- the option exists only for backwards + # compatibility in RSpec 3). It causes shared context metadata to be + # inherited by the metadata hash of host groups and examples, rather than + # triggering implicit auto-inclusion in groups with matching metadata. + config.shared_context_metadata_behavior = :apply_to_host_groups + +# The settings below are suggested to provide a good initial experience +# with RSpec, but feel free to customize to your heart's content. +=begin + # This allows you to limit a spec run to individual examples or groups + # you care about by tagging them with `:focus` metadata. When nothing + # is tagged with `:focus`, all examples get run. RSpec also provides + # aliases for `it`, `describe`, and `context` that include `:focus` + # metadata: `fit`, `fdescribe` and `fcontext`, respectively. + config.filter_run_when_matching :focus + + # Allows RSpec to persist some state between runs in order to support + # the `--only-failures` and `--next-failure` CLI options. We recommend + # you configure your source control system to ignore this file. + config.example_status_persistence_file_path = "spec/examples.txt" + + # Limits the available syntax to the non-monkey patched syntax that is + # recommended. For more details, see: + # - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/ + # - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/ + # - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode + config.disable_monkey_patching! + + # This setting enables warnings. It's recommended, but in some cases may + # be too noisy due to issues in dependencies. + config.warnings = true + + # Many RSpec users commonly either run the entire suite or an individual + # file, and it's useful to allow more verbose output when running an + # individual spec file. + if config.files_to_run.one? + # Use the documentation formatter for detailed output, + # unless a formatter has already been configured + # (e.g. via a command-line flag). + config.default_formatter = "doc" + end + + # Print the 10 slowest examples and example groups at the + # end of the spec run, to help surface which specs are running + # particularly slow. + config.profile_examples = 10 + + # Run specs in random order to surface order dependencies. If you find an + # order dependency and want to debug it, you can fix the order by providing + # the seed, which is printed after each run. + # --seed 1234 + config.order = :random + + # Seed global randomization in this process using the `--seed` CLI option. + # Setting this allows you to use `--seed` to deterministically reproduce + # test failures related to randomization by passing the same `--seed` value + # as the one that triggered the failure. + Kernel.srand config.seed +=end +end From 2604bc1b1c207a17b54e0ae18c26b84f2b6f22f1 Mon Sep 17 00:00:00 2001 From: Caroline Vurlumis Date: Sat, 21 Jul 2018 13:17:34 -0700 Subject: [PATCH 3/4] screen class updated, line answers complete --- .../line/line_answers.txt | 9 ++++++++ .../screen/pixel.rb | 12 +++++++++++ .../screen/screen.rb | 21 ++++++++++++++++++- 01-data-structures/spec/screen_spec.rb | 3 +++ 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/01-data-structures/01-introduction-to-data-structures/line/line_answers.txt b/01-data-structures/01-introduction-to-data-structures/line/line_answers.txt index e69de29b..7e704bf9 100644 --- a/01-data-structures/01-introduction-to-data-structures/line/line_answers.txt +++ b/01-data-structures/01-introduction-to-data-structures/line/line_answers.txt @@ -0,0 +1,9 @@ +1) How does your data structure allow developers to access and manipulate the data? +2) If a developer wanted to find a specific element in your data structure, how would you search for it? +3) What other real-world data can each structure represent? + +1) This data structure utilizes an array to store and manipulate information. Developers can access different elements in the array, such as the first, middle, or back and can delete or add elements to the line (an array in this case). + +2) In our line, which is an array data structure, a developer can search through it by utilizing the search function to search for a particular person in the line. If that person is not in the line, it will return nil. + +3) An array can be used to represent many real-world situations. An array would be great as a list (such as a grocery list), following the steps in a recipe, and any other ordered list. diff --git a/01-data-structures/01-introduction-to-data-structures/screen/pixel.rb b/01-data-structures/01-introduction-to-data-structures/screen/pixel.rb index e286557e..1d9bb8c2 100644 --- a/01-data-structures/01-introduction-to-data-structures/screen/pixel.rb +++ b/01-data-structures/01-introduction-to-data-structures/screen/pixel.rb @@ -12,11 +12,23 @@ class Pixel def initialize(red, green, blue, x, y) + @red = validate_color(red) + @green = validate_color(green) + @blue = validate_color(blue) + @x = x + @y = y end private def validate_color(color) + if color<0 + return 0 + elsif color>255 + return 255 + else + return + end end end diff --git a/01-data-structures/01-introduction-to-data-structures/screen/screen.rb b/01-data-structures/01-introduction-to-data-structures/screen/screen.rb index 8a0aee67..a6f7d65e 100644 --- a/01-data-structures/01-introduction-to-data-structures/screen/screen.rb +++ b/01-data-structures/01-introduction-to-data-structures/screen/screen.rb @@ -1,4 +1,5 @@ require_relative 'pixel' +require 'pp' class Screen attr_accessor :width @@ -6,18 +7,36 @@ class Screen attr_accessor :matrix def initialize(width, height) + @width = width + @height = height + @matrix = [] + for column in 0...height + @matrix.push([]) + for row in 0...width + @matrix[column].push(Pixel.new(0,0,0,row, column)) + end + end end # Insert a Pixel at x, y def insert(pixel, x, y) + if inbounds(x, y) + matrix[x][y]= pixel + end end def at(x, y) + if inbounds(x, y) + matrix[x][y] + else + return nil + end end private def inbounds(x, y) + (x>=0 && x < width) && (y>=0 && y < height) end -end \ No newline at end of file +end diff --git a/01-data-structures/spec/screen_spec.rb b/01-data-structures/spec/screen_spec.rb index e1ed5ae9..0ccc7d8d 100644 --- a/01-data-structures/spec/screen_spec.rb +++ b/01-data-structures/spec/screen_spec.rb @@ -1,4 +1,7 @@ +include RSpec + require_relative '../01-introduction-to-data-structures/screen/pixel' +require_relative '../01-introduction-to-data-structures/screen/screen' RSpec.describe Screen, type: Class do let(:screen) { Screen.new(10, 10) } From f30157897ab0a6fb3c2f44ef2c68e8b49b43f803 Mon Sep 17 00:00:00 2001 From: Caroline Vurlumis Date: Sat, 21 Jul 2018 19:21:26 -0700 Subject: [PATCH 4/4] completed myqueue, mystack assignments --- .../02-stacks-and-queues/myqueue/myqueue.rb | 14 ++++++++++++-- .../02-stacks-and-queues/mystack/mystack.rb | 9 ++++++++- .../myqueue => spec}/myqueue_spec.rb | 2 +- .../mystack => spec}/mystack_spec.rb | 4 ++-- 4 files changed, 23 insertions(+), 6 deletions(-) rename 01-data-structures/{02-stacks-and-queues/myqueue => spec}/myqueue_spec.rb (95%) rename 01-data-structures/{02-stacks-and-queues/mystack => spec}/mystack_spec.rb (94%) diff --git a/01-data-structures/02-stacks-and-queues/myqueue/myqueue.rb b/01-data-structures/02-stacks-and-queues/myqueue/myqueue.rb index 3b66c08b..5a95c436 100644 --- a/01-data-structures/02-stacks-and-queues/myqueue/myqueue.rb +++ b/01-data-structures/02-stacks-and-queues/myqueue/myqueue.rb @@ -4,15 +4,25 @@ class MyQueue def initialize @queue = Array.new - @head = @queue[0] + @head = nil + @tail = nil end def enqueue(element) + @queue.insert(@queue.length,element) + @head = @queue.first + @tail = @queue.last end def dequeue + temp = @queue.first + @queue.shift() + @tail = @queue.last + @head = @queue.first + return temp end def empty? + @queue.empty? end -end \ No newline at end of file +end diff --git a/01-data-structures/02-stacks-and-queues/mystack/mystack.rb b/01-data-structures/02-stacks-and-queues/mystack/mystack.rb index ff1ebe97..942bcc23 100644 --- a/01-data-structures/02-stacks-and-queues/mystack/mystack.rb +++ b/01-data-structures/02-stacks-and-queues/mystack/mystack.rb @@ -7,11 +7,18 @@ def initialize end def push(item) + @stack.insert(@stack.length,item) + self.top = @stack.last end def pop + item = @stack.last + @stack.delete_at(@stack.length-1) + self.top = @stack.last + return item end def empty? + @stack.empty? end -end \ No newline at end of file +end diff --git a/01-data-structures/02-stacks-and-queues/myqueue/myqueue_spec.rb b/01-data-structures/spec/myqueue_spec.rb similarity index 95% rename from 01-data-structures/02-stacks-and-queues/myqueue/myqueue_spec.rb rename to 01-data-structures/spec/myqueue_spec.rb index da5bc278..e64054f6 100644 --- a/01-data-structures/02-stacks-and-queues/myqueue/myqueue_spec.rb +++ b/01-data-structures/spec/myqueue_spec.rb @@ -1,6 +1,6 @@ include RSpec -require_relative 'myqueue' +require_relative '../02-stacks-and-queues/myqueue/myqueue' RSpec.describe MyQueue, type: Class do let(:q) { MyQueue.new } diff --git a/01-data-structures/02-stacks-and-queues/mystack/mystack_spec.rb b/01-data-structures/spec/mystack_spec.rb similarity index 94% rename from 01-data-structures/02-stacks-and-queues/mystack/mystack_spec.rb rename to 01-data-structures/spec/mystack_spec.rb index c0d1af80..d61c9b92 100644 --- a/01-data-structures/02-stacks-and-queues/mystack/mystack_spec.rb +++ b/01-data-structures/spec/mystack_spec.rb @@ -1,6 +1,6 @@ include RSpec -require_relative 'mystack' +require_relative '../02-stacks-and-queues/mystack/mystack' RSpec.describe MyStack, type: Class do let(:stack) { MyStack.new } @@ -45,4 +45,4 @@ expect(stack.empty?).to eq false end end -end \ No newline at end of file +end