Skip to content

Commit

Permalink
Floating point issue
Browse files Browse the repository at this point in the history 
Handled a floating point issue.
Cleared unneeded spaces.
Using dup instead of another initialization.
  • Loading branch information
@nadavshatz
nadavshatz committed Oct 5, 2014
1 parent dfa194b commit a20c15e
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 95 deletions.
84 changes: 44 additions & 40 deletions lib/paleta/color.rb
View file
@@ -1,12 +1,14 @@
require 'paleta/core_ext/math'
require 'bigdecimal'
require 'bigdecimal/util'

module Paleta
# Represents a color
class Color
include Math

attr_reader :red, :green, :blue, :hue, :saturation, :lightness, :hex

# Initailize a {Color}
#
# @overload initialize()
Expand Down Expand Up @@ -36,7 +38,6 @@ class Color
#
# @return [Color] A new instance of {Color}
def initialize(*args)

if args.length == 1 && args[0].is_a?(Color)
args[0].instance_variables.each do |key|
self.send("#{key[1..key.length]}=".to_sym, args[0].send("#{key[1..key.length]}"))
Expand All @@ -59,43 +60,43 @@ def initialize(*args)
raise(ArgumentError, "Invalid arguments")
end
end

def red=(val)
@red = range_validator(val, 0..255)
update_hsl
update_hex
end

def green=(val)
@green = range_validator(val, 0..255)
update_hsl
update_hex
end

def blue=(val)
@blue = range_validator(val, 0..255)
update_hsl
update_hex
end

def lightness=(val)
@lightness = range_validator(val, 0..100)
update_rgb
update_hex
end

def saturation=(val)
@saturation = range_validator(val, 0..100)
update_rgb
update_hex
end

def hue=(val)
@hue = range_validator(val, 0..360)
update_rgb
update_hex
end

def hex=(val)
raise(ArgumentError, "Invalid Hex String") unless val.length == 6 && /^[[:xdigit:]]+$/ === val
@hex = val.upcase
Expand All @@ -104,23 +105,23 @@ def hex=(val)
@blue = val[4..5].hex
update_hsl
end

# Determine the equality of the receiver and another {Color}
# @param [Color] color color to compare
# @return [Boolean]
def ==(color)
color.is_a?(Color) ? (self.hex == color.hex) : false
end

# Create a copy of the receiver and lighten it by a percentage
# @param [Number] percentage percentage by which to lighten the {Color}
# @return [Color] a lightened copy of the receiver
def lighten(percentage = 5)
copy = self.class.new(self)
copy = self.dup
copy.lighten!(percentage)
copy
end

# Lighten the receiver by a percentage
# @param [Number] percentage percentage by which to lighten the {Color}
# @return [Color] self
Expand All @@ -131,16 +132,16 @@ def lighten!(percentage = 5)
update_hex
self
end

# Create a copy of the receiver and darken it by a percentage
# @param [Number] percentage percentage by which to darken the {Color}
# @return [Color] a darkened copy of the receiver
def darken(percentage = 5)
copy = self.class.new(self)
copy = self.dup
copy.darken!(percentage)
copy
end

# Darken the receiver by a percentage
# @param [Number] percentage percentage by which to darken the {Color}
# @return [Color] self
Expand All @@ -151,15 +152,15 @@ def darken!(percentage = 5)
update_hex
self
end

# Create a copy of the receiver and invert it
# @return [Color] an inverted copy of the receiver
def invert
copy = self.class.new(self)
copy.invert!
copy
end

# Invert the receiver
# @return [Color] self
def invert!
Expand All @@ -170,7 +171,7 @@ def invert!
update_hex
self
end

# Create a copy of the receiver and desaturate it
# @return [Color] a desaturated copy of the receiver
def desaturate
Expand All @@ -182,20 +183,20 @@ def desaturate
# Desaturate the receiver
# @return [Color] self
def desaturate!
@saturation = 0
self.saturation = 0
update_rgb
update_hex
self
end

# Create a new {Color} that is the complement of the receiver
# @return [Color] a desaturated copy of the receiver
def complement
copy = self.class.new(self)
copy.complement!
copy
end

# Turn the receiver into it's complement
# @return [Color] self
def complement!
Expand All @@ -204,14 +205,14 @@ def complement!
update_hex
self
end

# Calculate the similarity between the receiver and another {Color}
# @param [Color] color color to calculate the similarity to
# @return [Number] a value in [0..1] with 0 being identical and 1 being as dissimilar as possible
def similarity(color)
distance({ :r => @red, :g => @green, :b => @blue}, { :r => color.red, :g => color.green, :b => color.blue}) / sqrt(3 * (255 ** 2))
end

# Return an array representation of a {Color} instance,
# @param [Symbol] model the color model, should be :rgb or :hsl
# @return [Array] an array of component values
Expand All @@ -226,25 +227,25 @@ def to_array(color_model = :rgb)
end
array
end

private

def rgb_init(red = 0, green = 0, blue = 0)
self.red = red
self.green = green
self.blue = blue
end

def hsl_init(hue = 0, saturation = 0, lightness = 0)
self.hue = hue
self.saturation = saturation
self.lightness = lightness
end

def hex_init(val = "000000")
self.hex = val
end

def update_hsl
r = @red / 255.0 rescue 0.0
g = @green / 255.0 rescue 0.0
Expand All @@ -253,10 +254,14 @@ def update_hsl
min = [r, g, b].min
max = [r, g, b].max
delta = max - min

h = 0
l = (max + min) / 2.0
s = ((l == 0 || l == 1) ? 0 : (delta / (1 - (2 * l - 1).abs)))
if ![1, 0].include?(l) && delta / 2.0 == l
s = 1.0
else
s = ((l == 0 || l == 1) ? 0 : (delta / (1 - (2 * l - 1).abs)))
end

if delta != 0
case max
Expand All @@ -265,23 +270,22 @@ def update_hsl
when b; h = ((r - g) / delta) + 4
end
end

@hue = h * 60
@hue += 360 if @hue < 0
@saturation = s * 100
self.saturation = s * 100
@lightness = l * 100
end

def update_rgb

h = @hue / 60.0 rescue 0.0
s = @saturation / 100.0 rescue 0.0
l = @lightness / 100.0 rescue 0.0

d1 = (1 - (2 * l - 1).abs) * s
d2 = d1 * (1 - (h % 2 - 1).abs)
d3 = l - (d1 / 2.0)

case h.to_i
when 0; @red, @green, @blue = d1, d2, 0
when 1; @red, @green, @blue = d2, d1, 0
Expand All @@ -291,12 +295,12 @@ def update_rgb
when 5; @red, @green, @blue = d1, 0, d2
else; @red, @green, @blue = 0, 0, 0
end

@red = 255 * (@red + d3)
@green = 255 * (@green + d3)
@blue = 255 * (@blue + d3)
end

def update_hex
r = @red.to_i.to_s(16) rescue "00"
g = @green.to_i.to_s(16) rescue "00"
Expand All @@ -306,7 +310,7 @@ def update_hex
b = "0#{b}" if b.length < 2
@hex = "#{r}#{g}#{b}".upcase
end

def range_validator(val, range)
range.include?(val) ? val : raise(ArgumentError, "Component range exceeded")
end
Expand Down
14 changes: 7 additions & 7 deletions lib/paleta/core_ext/math.rb
View file
Expand Up @@ -8,20 +8,20 @@ def distance(a, b)
a.each_with_index { |v, i| sum += (a[i] - b[i]) ** 2 } if a.is_a?(Array)
sqrt(sum)
end

def multiple_regression(dx, dy, dz)
regression = {}
regression[:slope], regression[:offset] = {}, {}
size = dx.size

raise "arguments not same length!" unless size == dy.size && size == dz.size

if size == 1
regression[:slope] = { :x => dx[0], :y => dy[0], :z => dz[0] }
regression[:offset] = { :x => 0, :y => 0, :z => 0 }
return regression
end

sxx = syy = szz = sxy = szx = syz = sx = sy = sz = 0
dx.zip(dy, dz).each do |x, y, z|
sxx += x ** 2
Expand All @@ -34,15 +34,15 @@ def multiple_regression(dx, dy, dz)
sy += y
sz += z
end

regression[:slope][:x] = ( size * sxy - sx * sz ) / ( size * sxx - sx ** 2 ).to_f
regression[:slope][:y] = ( size * syz - sz * sy ) / ( size * syy - sz ** 2 ).to_f
regression[:slope][:z] = ( size * syz - sz * sy ) / ( size * szz - sy ** 2 ).to_f

regression[:offset][:x] = (sz - regression[:slope][:x] * sx) / size
regression[:offset][:y] = (sy - regression[:slope][:y] * sz) / size
regression[:offset][:z] = (sx - regression[:slope][:z] * sy) / size

regression
end
end

0 comments on commit a20c15e

Please sign in to comment.