linear1 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31aee81c2882bacd6ef1a027d30a18285e13ad48
-  data.tar.gz: aff302ca97029bc3ca08288609a6da4e7acbec51
+  metadata.gz: 4c5ae06f9ef7e39d7113088124eeace11de9d2dc
+  data.tar.gz: fcce646488b19ee6e5964703e55062621d690ac9
 SHA512:
-  metadata.gz: 6a224cec4069c0ce61512d5dc99fb208f8a56388436f7789bccf2007ad8d0e4654e2967d96f185db7c0184f3033c34e00a3aaf968bdaec5bc8718e7e307a7319
-  data.tar.gz: 7e934f04c40b81c1f07f77ff4e2f633d17a00fb95182db37c41ff77383bc0b60fca256ffd63761f10adb8b570be27554812dbd133c7391641a42bb372ba1e1d7
+  metadata.gz: c0c7cc6131028b8d3062086905dca9a939cf026d429143b46bead734fef0ef6d3452f447d559034c6d80c061a6107860dfae3aedc9d01229ec3a856d02e6e1c1
+  data.tar.gz: 0d935cc343c3854bcc9396ceb181ff9453c68c415610d07cb31beb711dbc630c90c5e1561ad1ce3292a4af336bcef62068ee4933f194f5e1240eac4286d2d356

data/bin/linear1

@@ -3,6 +3,7 @@ require "linear1"
 include Linear1
 equation = proc do |index|
 	case ARGV[index]
+		when "arithmetic_sequence" then ArithmeticSequence
 		when "slope-intercept" then SlopeIntercept
 		when "standard" then Standard
 		when "function" then Function
@@ -13,6 +14,6 @@ end
 puts case ARGV[0]
 	when "graph" then Graph.new equation.call 1
 	when "display" then equation.call 1
-	when "execute" then equation.call(2).execute ARGV[1].to_f
+	when "execute" then equation.call(2).execute ARGV[1]
 	when "help" then "Help is not available. Please refer to the README."
 end

data/lib/linear1/{arthmetic_sequence.rb → arithmetic_sequence.rb}

@@ -1,12 +1,15 @@
 require "linear1/function"
 module Linear1
-	class ArthmeticSequence < Function
+	class ArithmeticSequence < Function
+		def self.find index
+			new *(ARGV[index..(ARGV.length - 1)])
+		end
 		attr_reader :a, :common_difference
+		alias d slope
 		alias d common_difference
 		private :slope, :y_intercept
 		alias to_a a
-		alias slope d
-		def initialize a
+		def initialize *a
 			i = 0
 			while i < a.length - 2 
 				raise ArgumentError, "Elements must have a common difference" unless a[i+1] - a[i] == a[i+2] - a[i+1]

data/lib/linear1/direct_variation.rb

@@ -7,7 +7,7 @@ module Linear1
 			new ARGV[index1]
 		end
 		def initialize k=1
-			super k, 0
+			super display_num(k), 0
 		end
 		alias k slope
 		alias constant_of_variation k

data/lib/linear1/function.rb

@@ -1,4 +1,7 @@
+autoload :BigDecimal, "bigdecimal"
 module Linear1
+	autoload :SlopeIntercept, "linear1/slope_intercept"
+	autoload :DirectVariation, "linear1/direct_variation"
 	class Function
 		attr_reader :slope, :y_intercept, :power
 		# @param i1 [Fixnum] the index to start search
@@ -12,8 +15,7 @@ module Linear1
 		# @param x [Integer, Float]
 		# @return [Integer, Float]
 		def execute x
-			raise ArgumentError unless x.kind_of? Numeric
-			return slope * x ** power + y_intercept
+			slope * display_num(x) ** power + y_intercept
 		end
 		alias f execute
 		def x_intercept
@@ -34,14 +36,12 @@ module Linear1
 		# @raise [TypeError]
 		def to_direct_variation
 			if direct_variation?
-				require "linear1/direct_variation"
 				DirectVariation.new slope
-			else
-				raise TypeError, "Unable to convert to DirectVariation"
+			else raise TypeError, "Unable to convert to DirectVariation"
 			end
 		end
 		def to_slope_intercept
-			raise "power must be 1" unless power == 1
+			raise TypeError, "power must be 1" unless power == 1
 			SlopeIntercept.new slope, y_intercept
 		end
 		alias to_dv to_direct_variation
@@ -61,25 +61,24 @@ module Linear1
 				when 8 then "\u2078"
 				when 9 then "\u2079"
 			end
-			return final
+			final
 		end
 		def idx(s)
-			return case s
+			case s
 				when 1 then String.new
 				when -1 then ?-
-			else
-				s
-			end
+			else s end
 		end
 		def display_num num
-			if num.to_r.to_s == num.to_s
-				num.to_r
-			elsif num.to_i.to_s == num.to_s
-				num.to_i
-			elsif num.to_f.to_s == num.to_s
-				num.to_f
-			elsif num.to_c.to_s == num.to_s
-				num.to_c
+			unless num.is_a? String then num
+			else 
+				case num
+					when 	Complex(num).to_s 	then	Complex(num)
+					when 	Rational(num).to_s 	then 	Rational(num)
+					when 	num.to_i.to_s	 	then 	num.to_i
+					when	num.to_f.to_s	 	then 	num.to_f
+					when	BigDecimal(num).to_s	then	BigDecimal(num)
+				end
 			end
 		end
 	end

data/lib/linear1/graph.rb

@@ -6,25 +6,23 @@ module Linear1
 		end
 		@@axis = {x: 75, y: 25}
     
-    		def self.axis(key)
+    		def self.axis key
     			@@axis[key]
     		end
 		
 		ORIGIN = {x: @@axis[:x] / 2, y: @@axis[:y] / 2} # The center of the graph
 	
   		def to_a
-  			final = Array.new
-  			y = 0
+  			final, y = Array.new, 0
   			@@axis[:y].times do
-  				final[y] = Array.new
-  				x = 0
+  				final[y], x = Array.new, 0
   				@@axis[:x].times do
-  					final[y][x] = (!to_hash[y].nil? && to_hash[y] == x - ORIGIN[:x] ) ? ?\u2022 : format_grid(x - ORIGIN[:x], y - ORIGIN[:y])
+  					final[y][x] = init_coord(x, y)
   					x += 1
   				end
   				y += 1
 			end
-			return final.reverse
+			final.reverse
 		end
 
 	
@@ -36,7 +34,7 @@ module Linear1
   					table[y] = x_exec if x_exec == y_exec
   				end
   			end
-  			return table
+  			table
   		end
   		alias to_h to_hash
   		alias xy to_hash
@@ -57,16 +55,18 @@ module Linear1
   				end
   				result << ?\n
   			end
-  			return result.center(100)
+  			result.center 100
   		end
   	
   		private
+  		
+  		def init_coord x, y
+ 			(!to_hash[y].nil? && to_hash[y] == x - ORIGIN[:x]) ? ?\u2022 : format_grid(x - ORIGIN[:x], y - ORIGIN[:y])
+ 		end
   	
   		def check_axis_argument(arg)
-			if !(num.kind_of?(Integer) )
-				raise ArgumentError, "Argument must be a kind of Integer"
-			elsif num % 2 != 0
-				raise ArgumentError, "Argument must be even"
+			if !(num.kind_of?(Integer) ) then raise ArgumentError, "Argument must be a kind of Integer"
+			elsif num % 2 != 0 then raise ArgumentError, "Argument must be even"
 			end
  		end
  
@@ -74,15 +74,10 @@ module Linear1
 		
 		# @return [String, nil]
 		def format_grid x, y
-			if x.zero? && y.zero?
-				"+"
-			elsif x.zero? && !y.zero?
-				"|"
-			elsif y.zero? && !x.zero?
-				"-"
-			else
-				" "
-			end
+			if x.zero? && y.zero? then "+"
+			elsif x.zero? && !y.zero? then "|"
+			elsif y.zero? && !x.zero? then "-"
+			else " " end
 		end
 				
 	end

data/lib/linear1/slope_intercept.rb

@@ -2,15 +2,10 @@ require "linear1/function"
 module Linear1
 	class SlopeIntercept < Function
 		def self.find(index1, array=ARGV)
-			i = 0
-			until i == 2
-				raise ArgumentError, "array[#{index1 + i}] must be a number" unless (array[index1 + i].to_i.to_s == array[index1 + i] || array[index1 + i].to_f.to_s == array[index1 + i])
-				i += 1
-			end
-			return new array[index1+0].to_f, array[index1+1].to_f
+			new array[index1 + 0], array[index1 + 1]
 		end
 		def to_s
-			return super.sub "f(x)", "y"
+			super.sub "f(x)", "y"
 		end
 		def initialize(slope, y_intercept)
 			super

data/lib/linear1/standard.rb

@@ -4,12 +4,11 @@ module Linear1
 		attr_reader :a, :b, :c
 		private :slope, :y_intercept
 		def self.find index
-			array = ARGV[index..(index + 2)]
-			$equation_index = index + 3
-			return new array[0], array[1], array[2]
+			array, $equation_index = ARGV[index..(index + 2)], $equation_index = index + 3
+			new array[0], array[1], array[2]
 		end
 		def initialize a, b, c
-			@a, @b, @c = a.to_f, b.to_f, c.to_f
+			@a, @b, @c = display_num(a), display_num(b), display_num(c)
 			super @c / @b / @a, @c / @b
 		end
 		def multiply int
@@ -29,7 +28,7 @@ module Linear1
 			new @a + int, @b + int, @c + int
 		end
 		def to_s
-			"#{idx a}x + #{idx b} = #{c}"
+			"#{idx a}x + #{idx b}y = #{c}"
 		end
 		def to_slope_intercept
 			require "linear1/slope_intercept"

data/lib/linear1/system.rb

@@ -7,7 +7,7 @@ module Linear1
     def execute x
       final = Array.new
       @equations.each {|equation| final << equation.execute(x)}
-      return final
+      final
     end
   end
 end

data/spec/lib/linear1/arithmetic_sequence_spec.rb

@@ -0,0 +1,14 @@
+require 'linear1/arithmetic_sequence'
+require 'bigdecimal'
+include Linear1
+RSpec.describe ArithmeticSequence do
+  describe "#new" do
+    [ [2, 3, 4, 5, 6], [1_000_000, 1_500_000, 2_000_000], [Complex(1, 2), Complex(2, 2), Complex(3, 2)] ].each do |args|
+      context "given #{args}" do
+        subject {ArithmeticSequence.new *args}
+        it "should not raise error" do expect{ArithmeticSequence.new *args}.to_not raise_error end
+	it {is_expected.to be_kind_of Function}
+      end
+    end
+  end
+end

data/spec/lib/linear1/graph_spec.rb

@@ -7,7 +7,6 @@ RSpec.describe Graph do
       it "should not raise error" do
         expect{Graph.new Function.new}.to_not raise_error
       end
-      %i[range domain to_a].each {|method| its(method) {is_expected.to be_an_instance_of Array} }
     end
   end
 end

data/spec/lib/linear1/slope_intercept_spec.rb

@@ -1,5 +1,4 @@
 require "linear1/slope_intercept"
-require "rational"
 include Linear1
 RSpec.describe SlopeIntercept do
 	describe "#new" do
@@ -17,7 +16,7 @@ RSpec.describe SlopeIntercept do
 			it {is_expected.to_not be_direct_variation}
 			its(:to_s) {is_expected.to eq "y = 3x + 6"}
 		end
-		[ [3, 5], [-2, -9], [Rational("2/3"), 3], [Rational("-5/8"), -2], [-5, -3] ].each do |spec|
+		[ [3, 5], [-2, -9], [4.7, 5.3], [Rational("2/3"), 3], [Rational("-5/8"), -2], [-5, -3] ].each do |spec|
 			context "given #{spec[0]}, #{spec[1]}" do
 				subject {SlopeIntercept.new spec[0], spec[1]}
 				its(:to_s) {is_expected.to eq "y = #{spec[0]}x + #{spec[1]}"}
@@ -25,6 +24,8 @@ RSpec.describe SlopeIntercept do
 					require "linear1/graph"
 					expect{Graph.new subject}.to_not raise_error
 				end
+				
+
 			end
 		end
 			

data/spec/lib/linear1/standard_spec.rb

@@ -2,9 +2,15 @@ require "linear1/standard"
 include Linear1
 RSpec.describe Standard do
 	describe "#new" do
-		subject {Standard.new rand, rand, rand}
-		it {is_expected.to be_kind_of Function}
-		it {is_expected.to respond_to :execute, :a, :b, :c, :direct_variation?}
+		[	[5_000_000, 3_969_567, 4_000_456], [2, 3, 4], [Rational(5, 4), Rational(3, 7), Rational(9, 11)], [2.3, 5.4, 3.6], [Complex(3, 4), Complex(9, 7), Complex(10, 13)]	].each do |args|
+			describe "given #{args[0]}, #{args[1]}, #{args[2]}" do
+				subject {Standard.new args.first, args[1], args[2]}
+				it {is_expected.to be_kind_of Function}
+				its(:to_s) {is_expected.to eq "#{args.first}x + #{args[1]}y = #{args[2]}"}
+				it {is_expected.to respond_to :execute, :add, :a, :b, :c, :direct_variation?}
+				
+			end
+		end
 	end
 end
 		

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linear1
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Zachary Perlmutter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -51,7 +51,7 @@ files:
 - README.md
 - bin/linear1
 - lib/linear1.rb
-- lib/linear1/arthmetic_sequence.rb
+- lib/linear1/arithmetic_sequence.rb
 - lib/linear1/direct_variation.rb
 - lib/linear1/function.rb
 - lib/linear1/graph.rb
@@ -59,6 +59,7 @@ files:
 - lib/linear1/slope_intercept.rb
 - lib/linear1/standard.rb
 - lib/linear1/system.rb
+- spec/lib/linear1/arithmetic_sequence_spec.rb
 - spec/lib/linear1/direct_variation_spec.rb
 - spec/lib/linear1/function_spec.rb
 - spec/lib/linear1/graph_spec.rb
@@ -90,6 +91,7 @@ signing_key:
 specification_version: 4
 summary: Does linear algebra, to an extent
 test_files:
+- spec/lib/linear1/arithmetic_sequence_spec.rb
 - spec/lib/linear1/direct_variation_spec.rb
 - spec/lib/linear1/function_spec.rb
 - spec/lib/linear1/graph_spec.rb