linear1 1.0.0.pre → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0958577ede7ba8fa57fd241fc9a29aae34cd911b
-  data.tar.gz: c8266881e23d9eab12c5538f0ee408eaf2271fe0
+  metadata.gz: 31aee81c2882bacd6ef1a027d30a18285e13ad48
+  data.tar.gz: aff302ca97029bc3ca08288609a6da4e7acbec51
 SHA512:
-  metadata.gz: f1311e4c1482095f42a3f034d32ec7a87c00f45b8d779d8fd004e5ee2356d76d88c1a613f18e78e5bc9e78bdc2a792696485c7e2c2b889e78fc876fdc28cc1e8
-  data.tar.gz: 41fff4658e2866970b790045db11b208a5a4bc19ae2e1ee56695d640f3e4cd7d6aeb8acc3f181f950fdb9501278581c503fa368c4f8286543d633b9cd741aa69
+  metadata.gz: 6a224cec4069c0ce61512d5dc99fb208f8a56388436f7789bccf2007ad8d0e4654e2967d96f185db7c0184f3033c34e00a3aaf968bdaec5bc8718e7e307a7319
+  data.tar.gz: 7e934f04c40b81c1f07f77ff4e2f633d17a00fb95182db37c41ff77383bc0b60fca256ffd63761f10adb8b570be27554812dbd133c7391641a42bb372ba1e1d7

data/lib/linear1/arthmetic_sequence.rb

@@ -3,6 +3,7 @@ module Linear1
 	class ArthmeticSequence < Function
 		attr_reader :a, :common_difference
 		alias d common_difference
+		private :slope, :y_intercept
 		alias to_a a
 		alias slope d
 		def initialize a
@@ -11,7 +12,7 @@ module Linear1
 				raise ArgumentError, "Elements must have a common difference" unless a[i+1] - a[i] == a[i+2] - a[i+1]
 				i += 1
 			end
-			@common_difference, @a = a[1] - a[0], a
+			@common_difference, @a = display_num(a[1]) - display_num(a[0]), a
 			super @common_difference, @a[0]
 		end
 		def to_s # Modified to count from zero instead of one

data/lib/linear1/function.rb

@@ -7,7 +7,7 @@ module Linear1
 			Function.new ARGV[i1], ARGV[i1 + 1], ARGV[i1 + 2]
 		end
 		def initialize(slope=1, y_intercept=0, power=1)
-			@slope, @y_intercept, @power = slope.to_f, y_intercept.to_f, power.to_i
+			@slope, @y_intercept, @power = display_num(slope), display_num(y_intercept), display_num(power)
 		end
 		# @param x [Integer, Float]
 		# @return [Integer, Float]
@@ -22,13 +22,16 @@ module Linear1
 		alias zero x_intercept
 		alias solution x_intercept
 		alias root x_intercept
-		def to_s
-			"f(x) = #{idx slope.to_i if slope.to_i == slope}x#{power_string unless power == 1}#{" + #{@y_intercept.to_i if @y_intercept.to_i == @y_intercept}" unless direct_variation?}"
+		alias solve root
+		def to_s # @return [String] the equation
+			"f(x) = #{idx display_num slope}x#{power_string unless power == 1}#{" + #{display_num @y_intercept}" unless direct_variation?}"
 		end
-		def direct_variation?
+		def direct_variation? # @return [Boolean]
 			y_intercept.zero? and power == 1
 		end
 		alias dv? direct_variation?
+		# @return [DirectVariation]
+		# @raise [TypeError]
 		def to_direct_variation
 			if direct_variation?
 				require "linear1/direct_variation"
@@ -68,6 +71,17 @@ module Linear1
 				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
+			end
+		end
 	end
 end
 			

data/lib/linear1/point_slope.rb

@@ -3,8 +3,8 @@ module Linear1
 	class PointSlope < Function
 		attr_reader :x1, :y1
 		private :y_intercept, :power
-		def initialize slope, x, y
-			@slope, @x1, @y1 = slope.to_f, x.to_f, y.to_f
+		def initialize x, y, slope
+			@slope, @x1, @y1 = display_num(slope), display_num(x), display_num(y)
 			super @slope, @x1 - @y1
 		end
 		def self.find index

data/spec/lib/linear1/point_slope_spec.rb

@@ -0,0 +1,14 @@
+require "linear1/point_slope"
+RSpec.describe Linear1::PointSlope do
+	describe "#new" do
+		[ [6, 3, 5], [-2, 1, -3], [-4, 2, 0] ].each do |spec|
+			context "given #{spec[0]}, #{spec[1]}, #{spec[2]}" do
+				subject {Linear1::PointSlope.new spec[0], spec[1], spec[2]}
+				it "should not raise error" do
+					expect{Linear1::PointSlope.new spec[0], spec[1], spec[2]}.to_not raise_error
+				end
+				its(:to_slope_intercept) {is_expected.to be_instance_of Linear1::SlopeIntercept}
+			end
+		end
+	end
+end

data/spec/lib/linear1/slope_intercept_spec.rb

@@ -1,4 +1,5 @@
 require "linear1/slope_intercept"
+require "rational"
 include Linear1
 RSpec.describe SlopeIntercept do
 	describe "#new" do
@@ -16,5 +17,16 @@ 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|
+			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]}"}
+				it "should be graphable" do
+					require "linear1/graph"
+					expect{Graph.new subject}.to_not raise_error
+				end
+			end
+		end
+			
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linear1
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0
 platform: ruby
 authors:
 - Zachary Perlmutter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -62,6 +62,7 @@ files:
 - spec/lib/linear1/direct_variation_spec.rb
 - spec/lib/linear1/function_spec.rb
 - spec/lib/linear1/graph_spec.rb
+- spec/lib/linear1/point_slope_spec.rb
 - spec/lib/linear1/slope_intercept_spec.rb
 - spec/lib/linear1/standard_spec.rb
 homepage: 
@@ -79,9 +80,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -92,5 +93,6 @@ test_files:
 - spec/lib/linear1/direct_variation_spec.rb
 - spec/lib/linear1/function_spec.rb
 - spec/lib/linear1/graph_spec.rb
+- spec/lib/linear1/point_slope_spec.rb
 - spec/lib/linear1/slope_intercept_spec.rb
 - spec/lib/linear1/standard_spec.rb