adding_multiples 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d2895d5ba0bfe67cdc8b3bdbcdf8ca3270efcfed0b56e1614d4b5af5350ded5
-  data.tar.gz: f1c5cdb768cbfa2b8746c7d7884f318b63821081889f849debd06b96ba311002
+  metadata.gz: 3b1d72002add177a4222beedcdb24ae22c74efeb30a1c87b4906cbed84268fdf
+  data.tar.gz: f19f98117bf407b211447f47693117630e63909b0ab7a2b006730551290b629a
 SHA512:
-  metadata.gz: 87cab09178d22030890cab54c393b14ecb4862ea14e232ba8466019d4e59c67c4c33040a95e7e58b52e4b3313e2aff366bdf1e0e9a163fef53141b25a6d5de31
-  data.tar.gz: b86e9c345d6c50d704d72e53c003bff5d793c813eac3f2b9a61c493bbac2b17ee1e501880dc93aaebc58861772fb22aaf3d793c3bc702dff3e6592cecfff828f
+  metadata.gz: d436ba8f937c6d88c5a60836bd16a43f493863457372d958673febf43ff572958577a1bca6e6683cb9c020016a3b27101d8e52b18029da41bcf67d7aae69cf31
+  data.tar.gz: 35a53fab0e2620646b76c9ed84d14a56e4ce6f3b20696c07e0d9a4aadcecde3d7a2b90b82dd08b0ce3830241344ab2d6c401bc4c95217cd86ce087a2e3d1d876

data/README.md

@@ -1,8 +1,8 @@
 # AddingMultiples
 
-Thank you for checking out my gem! The purpose of this gem is to provide the following information: `Sum of all multiples of 3 or 5 less than 1000`.
+Thank you for checking out my gem! The purpose of this gem is to answer the following information: `Find the sum of all multiples of 3 or 5 less than 1000`.
 
-However, I designed it to allow users to decide which positive integers and how many they would like to evaluate.
+However, users can input any two numbers the wish.
 
 ## Installation
 

data/lib/adding_multiples/CLI.rb

@@ -40,34 +40,33 @@ module AddingMultiples
         # ask user for another integer
         def get_another_integer
             input = ""
-            puts "\nWould you like to enter another number?"
-
-            while input != "y" && input != "n"
-                puts "Please enter 'y' or 'n'"
-                input = gets.strip.downcase
-            end
+            puts "\nPlease enter another positive integer:"
+            @integer << gets.strip
 
-            if input == "y"
-                get_positive_integer   
+            if @integer[@i].match(/\d+/)
+                sum_integer_multiples
             else
-                check_multiples
-            end
+                get_another_integer
+            end  
         end
 
-
         #loop through multiples and compare to range [1-1000], consider allowing user input for range
-        def check_multiples
+        def sum_integer_multiples
             @range = [1, 1000]
-            @multiple = 0
             @sum = 0
 
             @integer.each do |i|
                 integer = i.to_i
+                @multiple = 0
                 while @multiple < @range[1]
                     calculate_sum
                     @multiple += integer
                 end
             end
+            
+            # sum common multiples and subtract from total
+            sum_common_multiples
+            subtract_common_multiples
 
             puts "The sum of the multiples of the integers #{@integer} that are less than #{@range[1]} is #{@sum}"
 
@@ -76,7 +75,35 @@ module AddingMultiples
         # add multiples to sum
         def calculate_sum
             @sum += @multiple
+        end
+        
+        # sum common multiples
+        def sum_common_multiples
+            @range = [1, 1000]
+            @least_common_multiple = 15
+            @common_multiples_sum = 0
+            @multiple = 0
+
+
+            while @multiple < @range[1]
+                @common_multiples_sum += @multiple
+                @multiple += @least_common_multiple
+            end
+        end
+
+        #calculate least common multiple
+        def calculate_least_common_multiple
+            integer_0 = @integer[0].to_i
+            integer_1 = @integer[1].to_i
+            @least_common_multiple = integer_0 * integer_1
+
         end        
+
+        # subtract common multiples
+        def subtract_common_multiples
+            @sum -= @common_multiples_sum
+        end
+
               
     end
 end

data/lib/adding_multiples/version.rb

@@ -1,3 +1,3 @@
 module AddingMultiples
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adding_multiples
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - dicksonca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,8 @@ files:
 - Rakefile
 - adding_multiples-0.1.0.gem
 - adding_multiples-0.1.1.gem
+- adding_multiples-0.1.2.gem
+- adding_multiples-0.1.3.gem
 - adding_multiples.gemspec
 - bin/adding_multiples
 - bin/console