xrvg 0.0.7 → 0.0.8

data/test/test_color.rb

@@ -10,6 +10,23 @@ class ColorTest < Test::Unit::TestCase
     assert_equal( 0.2, color.g )
     assert_equal( 0.3, color.b )
     assert_equal( 0.4, color.a )
+
+    assert_equal( Color[0.5, 0.2, 0.3, 0.4], color.r(0.5) )
+    assert_equal( Color[0.1, 0.5, 0.3, 0.4], color.g(0.5) )
+    assert_equal( Color[0.1, 0.2, 0.5, 0.4], color.b(0.5) )
+    assert_equal( Color[0.1, 0.2, 0.3, 0.5], color.a(0.5) )
+
+    assert_equal( 0.0, Color.red.hue )
+    assert_equal( Color.hsva( 0.1, 1.0, 1.0, 1.0 ), Color.red.hue( 0.1 ) )
+
+    assert_equal( 1.0, Color.red.saturation )
+    assert_equal( Color.hsva( 0.0, 0.1, 1.0, 1.0 ), Color.red.saturation( 0.1 ) )
+
+    assert_equal( 1.0, Color.red.value )
+    assert_equal( Color.hsva( 0.0, 1.0, 0.1, 1.0 ), Color.red.value( 0.1 ) )
+
+    assert_equal( 0.5, Color.red.lightness )
+    assert_equal( Color.hsla( 0.0, 1.0, 0.1, 1.0 ), Color.red.lightness( 0.1 ) )
   end
 
   def test_colors
@@ -52,6 +69,8 @@ class ColorTest < Test::Unit::TestCase
     assert_equal( black, Color.hsva( 0.8, 1.0, 0.0, 1.0 ) )
     assert_equal( black, Color.hsva( 1.0, 1.0, 0.0, 1.0 ) )
     assert_equal( [0.0, 0.0, 0.0, 1.0], black.hsva )
+    assert_equal( [2.0/3.0, 1.0, 1.0, 1.0], Color.blue.hsva )
+    assert_equal( [1.0/3.0, 1.0, 1.0, 1.0], Color.green.hsva )
   end
 
   def test_hsl
@@ -64,6 +83,7 @@ class ColorTest < Test::Unit::TestCase
     assert_equal( white, Color.hsla( 2.0, 1.0, 1.0, 1.0 ) )
     assert_equal( white, Color.hsla( 0.6, 1.0, 1.0, 1.0 ) )
     assert_equal( [0.0, 0.0, 0.0, 1.0], black.hsla )
+    assert_equal( 0.0, Color[0.9,0.8,0.8,1.0].hsla[0] )
   end
 
 
@@ -119,7 +139,22 @@ class PaletteTest < Test::Unit::TestCase
     palette.interpoltype = :linear
     assert_equal( :linear, palette.interpoltype  )
   end
-  
+
+  def test_hsv
+    palette = Palette[ :colorlist, [ 0.0, Color.hsva( 0.5, 0.5, 0.5, 0.5), 1.0, Color.hsva( 0.6, 0.6, 0.6, 0.6 ) ], :interpoldomain, :hsv ]
+    assert_equal( Color.hsva( 0.55, 0.55, 0.55, 0.55), palette.sample( 0.5 ) )
+  end
+
+  def test_hsl
+    palette = Palette[ :colorlist, [ 0.0, Color.hsla( 0.5, 0.5, 0.5, 0.5), 1.0, Color.hsla( 0.6, 0.6, 0.6, 0.6 ) ], :interpoldomain, :hsl ]
+    assert_equal( Color.hsla( 0.55, 0.55, 0.55, 0.55), palette.sample( 0.5 ) )
+  end
+
+  def test_error
+    assert_raise(RuntimeError) {Palette[ :colorlist, [ 0.0, Color.hsla( 0.5, 0.5, 0.5, 0.5), 1.0, Color.hsla( 0.6, 0.6, 0.6, 0.6 ) ], :interpoldomain, :toto ]}
+  end
+
+
 end
 
 class GradientTest < Test::Unit::TestCase

data/test/test_intersection.rb

@@ -0,0 +1,42 @@
+require 'test/unit'
+require 'xrvg'
+include XRVG
+
+
+class V2DExtTest < Test::Unit::TestCase
+
+  def test_isLeft
+    p0 = V2D::O
+    p1 = V2D::X
+    assert_equal(  :on,    V2D[ 0.5,  0.0].isLeft( p0, p1 ) )
+    assert_equal(  :left,  V2D[ 0.5,  0.1].isLeft( p0, p1 ) )
+    assert_equal(  :right, V2D[ 0.5, -0.1].isLeft( p0, p1 ) )
+  end
+end
+
+
+class V2DSTest < Test::Unit::TestCase
+
+  def test_intersect
+    assert_equal( true, V2DS[ V2D[ 0.0, 0.5 ], V2D[ 1.0, -0.5 ] ].intersect?( V2DS[ V2D::X, V2D::O ] ))
+    assert_equal( false, V2DS[ V2D[ 0.0, 0.5 ], V2D[ 1.0, -0.5 ] ].intersect?( V2DS[V2D[ 0.0, 1.0 ], V2D[ 1.0, 1.0 ] ]) )
+    assert_equal( true, V2DS[ V2D::X, V2D::O ].intersect?( V2DS[ V2D::X, V2D::O ] ) )
+    assert_equal( true, V2DS[ V2D::X, V2D::O ].intersect?( V2DS[ V2D::Y, V2D::O ] ) )
+    assert_equal( false, V2DS[ V2D::X, V2D::O ].intersect?( V2DS[ V2D::Y + V2D::X, V2D::O + V2D::Y ] ) )
+  end
+
+  def test_intersection
+    assert_equal( nil, V2DS[ V2D[ 0.0, 0.5 ], V2D[ 1.0, -0.5 ] ].intersection( V2DS[V2D[ 0.0, 1.0 ], V2D[ 1.0, 1.0 ] ]) )
+    assert_equal( V2D[0.5,0.0], V2DS[ V2D[ 0.0, 0.5 ], V2D[ 1.0, -0.5 ] ].intersection( V2DS[ V2D::X, V2D::O ] ))
+  end
+
+  def test_intersections
+    c1 = Bezier.raw( V2D[0.0, 0.0], V2D[1.0, 0.0], V2D[0.0, 1.0], V2D[1.0, 1.0] )
+    c2 = LinearBezier[:support, [V2D::O  + V2D::Y, V2D::X]]
+    [[0.5, 0.5], Bezier.intersections( c1, c2 )].forzip do |ve, vr|
+      assert( ve.fequal?( vr ) )
+    end
+    c2 = LinearBezier[:support, [V2D::O, V2D::X + V2D::Y]]
+    # assert_equal( [0.0, 0.0, 0.5, 0.5, 1.0, 1.0], Bezier.intersections( c1, c2 ) )
+  end
+end

data/test/test_sample.rb

@@ -4,11 +4,6 @@ include XRVG
 
 class STest < Test::Unit::TestCase
 
-  def test_sample
-    # assert_equal( [0.0, 0.571428571428571, 0.857142857142857, 1.0],  (0.0..1.0).geofull(2.0).samples( 4 ) )
-    assert_equal( [0.0, 0.5, 0.75], [(0.0..0.75)].geofull(2.0).samples( 3 ) )
-  end
-
   def test_sin
     [[0.0,0.0], (0.0..1.0).sin().samples( 2 )].forzip do |exp, real|
       assert( exp.fequal?( real ) )
@@ -25,4 +20,60 @@ class STest < Test::Unit::TestCase
   end
 end
 
+class SyncTest < Test::Unit::TestCase
+
+  def test_samples
+    assert_equal( [0.0, 1.0, 0.5, 0.5, 1.0, 0.0], SyncS[(0.0..1.0), (1.0..0.0)].samples(3))
+  end
+
+  def test_samples2
+    result = []
+    SyncS[(0.0..1.0), (1.0..0.0)].samples(3) {|v1,v2| result += [v1,v2] }
+    assert_equal( [0.0, 1.0, 0.5, 0.5, 1.0, 0.0], result )
+  end
+
+  def test_sample
+    assert_equal( [0.0, 0.5, 0.75], SyncS[(0.0..0.75)].geofull(2.0).samples( 3 ) )
+    assert_equal( [0,1,0], SyncS[ [0,1] ].samples( 3 ) )
+  end
+
+end
+
+class RollerTest < Test::Unit::TestCase
+
+  def test_roller
+    assert_equal( ["a", "b", "a"], Roller["a","b"].samples(3))
+
+    rand = Roller["a","b"].rand
+    assert( ["a","b"].include?( rand ) )
+  end
+
+  def test_next
+    roller = Roller[0,1]
+    result = []
+    3.times do
+      result << roller.next
+    end
+    assert_equal( [0,1,0], result )
+  end
+
+end
+
+class RandomTest < Test::Unit::TestCase
+
+  def test_random
+    result = Range.O.random(:mindiff,0.0).samples( 3 )
+    # what kinf of test ?
+    assert_raise(RuntimeError) {Range.O.random(:mindiff,6.0).samples( 3 )}
+    assert_equal( [0.0,1.0,2.0], (0.0..2.0).random(:mindiff,0.5,:sort,true).samples( 3 ) )
+    assert_not_equal( [0.0, 1.0], (0.0..1.0).random.samples(2))
+    assert_equal( [0.0, 0.5, 1.0], (0.0..1.0).random(:mindiff,0.5,:sort,true).samples(3))
+    assert_raise(RuntimeError) {(0.0..1.0).random(:mindiff,0.6).samples(3)}
+
+    result = Range.O.random(:mindiff,0.0, :withboundaries, true).samples( 3 )
+    assert_equal( 0.0, result[0] )
+    assert_equal( 1.0, result[-1] )
+  end
+
+end
 

data/test/test_spiral.rb

@@ -18,5 +18,13 @@ class SpiralTest < Test::Unit::TestCase
     assert_raise(NotImplementedError) {GSpiral.new.maxangle( 0.0,0.0,0.0)}
   end
 
+  def test_tangent
+    spiral    = SpiralLog[]
+    tangent   = SpiralLog.tangent( V2D::O, V2D::X, 1.0 )
+    newspiral = SpiralLog.fromtangent( tangent, V2D::X, 1.0 )
+    assert_equal( spiral.point( 0.0 ), newspiral.point( 0.0 ) )
+    assert_equal( spiral.point( 1.0 ), newspiral.point( 1.0 ) )
+  end
+  
 end
 

data/test/test_utils.rb

@@ -17,16 +17,6 @@ end
 
 class ArrayTest < Test::Unit::TestCase
 
-  def test_samples
-    assert_equal( [0.0, 1.0, 0.5, 0.5, 1.0, 0.0], [(0.0..1.0), (1.0..0.0)].samples(3))
-  end
-
-  def test_samples2
-    result = []
-    [(0.0..1.0), (1.0..0.0)].samples(3) {|v1,v2| result += [v1,v2] }
-    assert_equal( [0.0, 1.0, 0.5, 0.5, 1.0, 0.0], result )
-  end
-
   def test_pairs
     a = [ 1, 2, 3]
     b = Array.new
@@ -122,10 +112,6 @@ class ArrayTest < Test::Unit::TestCase
     assert_equal( (1.0..2.0), [V2D[2.0,1.0], V2D[1.0,2.0]].range( :x ) )    
   end
 
-  def test_sample
-    assert_equal( [0.0, 0.5, 0.75], [(0.0..0.75)].geofull(2.0).samples( 3 ) )
-  end
-
   def test_choice
     assert_equal( 0.0, [0.0,0.0,0.0].choice )
   end
@@ -187,16 +173,6 @@ class RangeTest  < Test::Unit::TestCase
     assert_not_equal( [0.0, 1.0], (0.0..1.0).ssort.random.samples(2))
   end
   
-  def test_random
-    result = Range.O.random(:mindiff,0.0).samples( 3 )
-    # what kinf of test ?
-    assert_raise(RuntimeError) {Range.O.random(:mindiff,6.0).samples( 3 )}
-    assert_equal( [0.0,1.0,2.0], (0.0..2.0).random(:mindiff,0.5,:sort,true).samples( 3 ) )
-    assert_not_equal( [0.0, 1.0], (0.0..1.0).random.samples(2))
-    assert_equal( [0.0, 0.5, 1.0], (0.0..1.0).random(:mindiff,0.5,:sort,true).samples(3))
-    assert_raise(RuntimeError) {(0.0..1.0).random(:mindiff,0.6).samples(3)}
-  end
-
   def test_shuffle
     assert_not_equal( [0.0, 0.25, 0.5, 0.75, 1.0], (0.0..1.0).shuffle.samples(5))
     assert_equal( [0.0, 0.25, 0.5, 0.75, 1.0], (0.0..1.0).ssort.shuffle.samples(5))
@@ -342,14 +318,7 @@ class SampleTest < Test::Unit::TestCase
 
   def test_class_sample
     s = SampleClass.new
-    assert_equal( ["a0.0", "b0.0", "a0.5", "b0.5", "a1.0", "b1.0"], [s.filter(:sampleA), s.filter(:sampleB)].samples(3))
-  end
-
-  def test_roller
-    assert_equal( ["a", "b", "a"], Roller["a","b"].samples(3))
-
-    rand = Roller["a","b"].rand
-    assert( ["a","b"].include?( rand ) )
+    assert_equal( ["a0.0", "b0.0", "a0.5", "b0.5", "a1.0", "b1.0"], SyncS[s.filter(:sampleA), s.filter(:sampleB)].samples(3))
   end
 
   def test_random_split

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: xrvg
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
-date: 2008-08-24 00:00:00 +02:00
+  version: 0.0.8
+date: 2008-08-25 00:00:00 +02:00
 summary: Ruby vector graphics library
 require_paths: 
 - lib
@@ -31,12 +31,28 @@ authors:
 files: 
 - Rakefile
 - LICENCE
+- lib/bezier.rb
+- lib/bezierbuilders.rb
+- lib/beziermotifs.rb
+- lib/bezierspline.rb
+- lib/beziertools.rb
+- lib/color.rb
+- lib/fitting.rb
+- lib/frame.rb
 - lib/geometry2D.rb
+- lib/geovariety.rb
+- lib/interbezier.rb
 - lib/interpolation.rb
+- lib/intersection.rb
 - lib/parametriclength.rb
+- lib/render.rb
 - lib/samplation.rb
+- lib/shape.rb
+- lib/spiral.rb
+- lib/style.rb
 - lib/trace.rb
 - lib/utils.rb
+- lib/xrvg.rb
 - examples/arciterate1.rb
 - examples/arcrecurse1.rb
 - examples/arcrecurse2.rb
@@ -88,6 +104,7 @@ test_files:
 - test/test_geovariety.rb
 - test/test_interbezier.rb
 - test/test_interpolation.rb
+- test/test_intersection.rb
 - test/test_parametric_length.rb
 - test/test_render.rb
 - test/test_sample.rb