xrvg 0.0.5 → 0.0.6

data/test/test_geovariety.rb

@@ -0,0 +1,105 @@
+require 'test/unit'
+require 'geovariety'
+
+
+class GeoVarietor
+  include GeoVariety
+end
+
+class GeoVarietyTest < Test::Unit::TestCase
+
+  def test_abstract
+    assert_raise(NotImplementedError){GeoVarietor[].point(V2D::O)}
+    assert_raise(NotImplementedError){GeoVarietor[].line(0.0,1.0,0.5)}
+  end
+end
+
+class InterBezierTest2 < Test::Unit::TestCase
+
+  def test_point
+    bezier1 = Bezier.raw( V2D::O, V2D::X, V2D::O, V2D::X  )
+    center  = V2D::O
+    bezier2 = Bezier.raw( center, center, center, center )
+    interbezier  = InterBezier.new( :bezierlist, [0.0, bezier1, 1.0, bezier2] )
+    assert( V2D.vequal?( interbezier.sample( 0.5 ).point( 0.5 ), interbezier.point( V2D[0.5,0.5] ) ) )
+  end
+
+  def test_line
+    bezier1 = Bezier.raw( V2D::O, V2D::X, V2D::O, V2D::X  )
+    center  = V2D::O
+    bezier2 = Bezier.raw( center, center, center, center )
+    interbezier  = InterBezier.new( :bezierlist, [0.0, bezier1, 1.0, bezier2] )
+    raw = interbezier.sample( 0.5 ).subbezier( 0.3, 0.7 )
+    geo = interbezier.line( 0.3, 0.7, 0.5 )
+    [raw.pointlist, geo.pointlist].forzip do |p1,p2|
+      assert( V2D.vequal?( p1, p2 ) )
+    end
+  end
+
+  def test_bezier
+    bezier1     = Bezier.raw( V2D::O, V2D::X, V2D::O, V2D::X  )
+    center      = V2D::O
+    bezier2     = Bezier.raw( center, center, center, center )
+    interbezier = InterBezier.new( :bezierlist, [0.0, bezier1, 1.0, bezier2] )
+
+    geo = interbezier.bezier( (V2D[0.0,0.5]..V2D[1.0,0.5]), bezier1 )
+    raw = LinearBezier[ :support, [V2D::O, V2D::X * 0.5] ]
+    [raw.pointlist, geo.pointlist].forzip do |p1,p2|
+      assert( V2D.vequal?( p1, p2 ) )
+    end
+  end
+end
+
+
+class OffsetVarietyTest < Test::Unit::TestCase
+
+  def test_point
+    offsetvariety = OffsetVariety[ :support, LinearBezier.buildwithangle( 0.0 ), :ampl, 1.0 ]
+    assert( V2D.vequal?( V2D[0.5,0.0], offsetvariety.point( V2D[0.5,0.5] ) ) )
+  end
+
+  def test_line
+    offsetvariety = OffsetVariety[ :support, LinearBezier.buildwithangle( 0.0 ), :ampl, 1.0 ]
+    geo = offsetvariety.line( 0.25, 0.75, 0.75 )
+    raw = LinearBezier[ :support, [V2D[0.25,0.5], V2D[0.75,0.5]] ]
+    [raw.pointlist, geo.pointlist].forzip do |p1,p2|
+      assert( V2D.vequal?( p1, p2 ) )
+    end
+  end
+
+  def test_bezier
+    offsetvariety = OffsetVariety[ :support, LinearBezier.buildwithangle( 0.0 ), :ampl, 1.0 ]
+    geo = offsetvariety.bezier( (V2D[0.25,0.75]..V2D[0.75,0.75]), LinearBezier.buildwithangle( 0.0 ) )
+    raw = LinearBezier[ :support, [V2D[0.25,0.5], V2D[0.75,0.5]] ]
+    [raw.pointlist, geo.pointlist].forzip do |p1,p2|
+      assert( V2D.vequal?( p1, p2 ) )
+    end
+  end
+end
+
+class FuseauVarietyTest < Test::Unit::TestCase
+
+  def test_point
+    offsetvariety = FuseauVariety[ :support, LinearBezier.buildwithangle( 0.0 ), :ampl, 1.0 ]
+    assert( V2D.vequal?( V2D[0.5,0.0], offsetvariety.point( V2D[0.5,0.5] ) ) )
+  end
+
+  def test_line
+    offsetvariety = FuseauVariety[ :support, LinearBezier.buildwithangle( 0.0 ), :ampl, 1.0 ]
+    geo = offsetvariety.line( 0.25, 0.75, 0.5 )
+    raw = LinearBezier[ :support, [V2D[0.0,0.0], V2D[1.0,0.0]] ].subbezier( 0.25, 0.75 )
+    [raw.pointlist, geo.pointlist].forzip do |p1,p2|
+      assert( V2D.vequal?( p1, p2 ) )
+    end
+  end
+
+  def test_bezier
+    offsetvariety = FuseauVariety[ :support, LinearBezier.buildwithangle( 0.0 ), :ampl, 1.0 ]
+    geo = offsetvariety.bezier( (V2D[0.25,0.5]..V2D[0.75,0.5]), LinearBezier.buildwithangle( 0.0 ) )
+    raw = LinearBezier[ :support, [V2D[0.25,0.0], V2D[0.75,0.0]] ]
+    [raw.pointlist, geo.pointlist].forzip do |p1,p2|
+      assert( V2D.vequal?( p1, p2 ) )
+    end
+  end
+end
+

data/test/test_interpolation.rb

@@ -4,7 +4,7 @@ require 'interpolation'
 class InterpolatorTest < Test::Unit::TestCase
   
   def test_quadtree
-    quad = QuadTree.new( [0.0,1.0, 0.2,0.0, 0.6,1.0,  0.8,0.0, 1.0,1.0]  )
+    quad = BinaryTree.new( [0.0,1.0, 0.2,0.0, 0.6,1.0,  0.8,0.0, 1.0,1.0]  )
     assert_equal( [0.2,0.0, 0.6,1.0], quad.range( 0.5 ) )
     assert_equal( [0.0,1.0, 0.2,0.0], quad.range( 0.0 ) )
     assert_equal( [0.8,0.0, 1.0,1.0], quad.range( 1.0 ) )
@@ -22,6 +22,7 @@ class InterpolatorTest < Test::Unit::TestCase
   end
   def test_interpolation
     assert_raise(NotImplementedError) {A[].samplelist}
+    assert_equal( :linear, A[].interpoltype )
   end
 
 end

data/test/test_render.rb

@@ -4,7 +4,6 @@ require 'render'
 class SVGRenderTest  < Test::Unit::TestCase
 
   def test_render
-    require 'shape'
     if File.exist?( "svgrender.svg" ) 
       File.delete( "svgrender.svg" ) 
     end
@@ -15,7 +14,6 @@ class SVGRenderTest  < Test::Unit::TestCase
   end
 
   def test_render2
-    require 'shape'
     if File.exist?( "svgrender.svg" ) 
       File.delete( "svgrender.svg" ) 
     end
@@ -29,7 +27,6 @@ class SVGRenderTest  < Test::Unit::TestCase
   end
 
   def test_render3
-    require 'shape'
     if File.exist?( "svgrender.svg" ) 
       File.delete( "svgrender.svg" ) 
     end
@@ -40,7 +37,6 @@ class SVGRenderTest  < Test::Unit::TestCase
   end
 
   def test_render4
-    require 'shape'
     if File.exist?( "svgrender.svg" ) 
       File.delete( "svgrender.svg" ) 
     end

data/test/test_sample.rb

@@ -0,0 +1,28 @@
+require 'test/unit'
+require 'xrvg'
+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 ) )
+    end
+  end
+
+  def test_random
+    result = (0.0..1.0).random.samples( 10 )
+    assert_not_equal( result, result.sort )
+    result = (0.0..1.0).random(:sort,true).samples( 10 )
+    assert_equal( result, result.sort )
+    result = (0.0..1.0).random(:mindiff, 0.01).samples( 10 )
+    assert_not_equal( result, result.sort )
+  end
+end
+
+

data/test/test_spiral.rb

@@ -0,0 +1,22 @@
+require 'test/unit'
+# require 'XRVG'
+# include XRVG
+
+class SpiralTest < Test::Unit::TestCase
+
+  def test_abstract
+    assert_raise(NotImplementedError) {GSpiral.new.compute_radius( 0.0,0.0,0.0,0.0)}
+  end
+  
+  def test_all
+    spiral = SpiralLog[]
+    # assert_equal( V2D::O, spiral.point( 1.0 ) )
+    assert_equal( V2D::X, spiral.point( 0.0 ) )
+    spiral = SpiralLinear[]
+    assert_equal( V2D::X, spiral.point( 0.0 ) )
+    
+    assert_raise(NotImplementedError) {GSpiral.new.maxangle( 0.0,0.0,0.0)}
+  end
+
+end
+

data/test/test_utils.rb

@@ -1,39 +1,7 @@
 require 'test/unit'
-require 'utils'
+require 'xrvg'
+include XRVG
 
-class IntegerTest < Test::Unit::TestCase
-
-  def test_denum!
-    assert_equal( [10.0, 20.0, 30.0], (10.0..30.0).samples( 3 ) )
-  end
-
-  def test_numsplit!
-    assert_equal( [0.0, 5.0, 10.0], (0.0..10.0).samples( 3 ) )
-  end
-
-  def test_itergeo!
-    # assert_equal( [1.0, 0.246596963941606, 0.0608100626252179], (1.0..0.0).geo(2.8).samples(3) )
-  end
-
-  def test_randsplit1!
-    result = 3.randsplit!
-    assert_equal( 1.0, result[0] + result[1] + result[2] )
-    assert_equal( [], 3.randsplit!( 4.0 ) )
-  end
-
-  def test_randsplitsum!
-    result = 3.randsplitsum!
-    puts "test_randsplitsum! result #{result.join(" ")}"
-    result.each_cons(2) {|min, max| assert( min <= max )}
-  end
-
-  def test_randsplitsum2!
-    result = 3.randsplitsum!(0.3)
-    puts "test_randsplitsum! minsize result #{result.join(" ")}"
-    result.each_cons(2) {|min, max| assert( min <= max )}
-  end
-
-end
 
 class StringTest < Test::Unit::TestCase
 
@@ -151,9 +119,20 @@ class ArrayTest < Test::Unit::TestCase
 
   def test_range
     assert_equal( (1.0..5.0), [5.0,3.0,1.0].range )    
+    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
 
+  def test_shuffle
+    assert_not_equal( [0.0, 0.1, 0.2, 0.5, 1.0], [0.0,0.1, 0.2, 0.5,1.0].shuffle )
+  end
 end
 
 class FloatTest < Test::Unit::TestCase
@@ -163,14 +142,17 @@ class FloatTest < Test::Unit::TestCase
   end
 
   def test_complement
-    assert_equal( 0.75, 0.25.complement )
+    assert_equal( 0.75, (0.0..1.0).complement( 0.25 ) )
+  end
+
+  def test_fequal
+    assert( 0.25.fequal?( 0.26,0.02) )
+    assert_equal( false, 0.25.fequal?( 0.26,0.01) )
   end
 
-  def test_randsplit
-    assert_equal( 2, 0.25.randsplit.length )
-    puts "randsplit 0.25 #{0.25.randsplit}"
-    r = 0.25.randsplit
-    assert_equal( 0.25, r[0] + r[1] )
+  def test_sort_float_list
+    assert_equal( [0.25],      Float.sort_float_list([0.26,0.25], 0.02 ) )
+    assert_equal( [0.25,0.26], Float.sort_float_list([0.26,0.25], 0.01 ) )
   end
 
   def test_float_include
@@ -195,6 +177,20 @@ 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))
+  end
 
   def test_samplesblock
     result = []
@@ -209,6 +205,31 @@ class RangeTest  < Test::Unit::TestCase
     assert_equal( [(0.0..0.5), (0.5..1.0)], (0.0..1.0).splits(2) )
   end
 
+  def test_modulo
+    assert_equal( -0.5, (-1.0..1.5).modulo( 2.0 ) )
+  end
+
+  def test_modulos
+    assert_equal( [(0.2..0.3)], (0.0..1.0).modulos( (0.2..0.3) ) )
+    assert_equal( [(0.3..0.2)], (0.0..1.0).modulos( (0.3..0.2) ) )
+    [(0.0..1.0).modulos( (1.1..0.2) ), [(0.1..0.0), (1.0..0.2)]].forzip do |res, exp|
+      assert( res.begin.fequal?( exp.begin ) )
+      assert( res.end.fequal?( exp.end ) )
+    end
+    [(0.0..1.0).modulos( (0.2..1.1) ), [(0.2..1.0), (0.0..0.1)]].forzip do |res, exp|
+      assert( res.begin.fequal?( exp.begin ) )
+      assert( res.end.fequal?( exp.end ) )
+    end
+    [(0.0..1.0).modulos( (0.2..2.1) ), [(0.2..1.0), (0.0..1.0), (0.0..0.1)]].forzip do |res, exp|
+      assert( res.begin.fequal?( exp.begin ) )
+      assert( res.end.fequal?( exp.end ) )
+    end
+  end
+
+  def test_size
+    assert_equal( 1.2, (2.0..0.8).size )
+  end
+
   def test_splitblock
     result = []
     (0.0..1.0).splits(2) do |subrange|
@@ -331,6 +352,10 @@ class SampleTest < Test::Unit::TestCase
     assert_equal( 1.0, (0.0..1.0).geo(100.0).sample( 1.0 ) )
   end
 
+  def test_geofull
+    assert_equal( [0.0,2.0/3.0,1.0], (0.0..1.0).geofull(2.0).samples( 3 ))
+  end
+
   def test_alternate
     assert_equal( [1.0,1.5], (1.0..0.0).alternate.samples( [0.0,0.5] ) )
     assert_equal( [0.0,-0.5], AlternateFilter[(0.0..1.0)].samples( [0.0,0.5] ) )

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: xrvg
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
-date: 2008-03-22 00:00:00 +01:00
+  version: 0.0.6
+date: 2008-08-06 00:00:00 +02:00
 summary: Ruby vector graphics library
 require_paths: 
 - lib
@@ -40,27 +40,48 @@ files:
 - lib/fitting.rb
 - lib/frame.rb
 - lib/geometry2D.rb
+- lib/geovariety.rb
 - lib/interbezier.rb
 - lib/interpolation.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
 - examples/bezierbasic.rb
 - examples/bezierbasicvector.rb
+- examples/circleiterate1.rb
+- examples/circleiterate2.rb
+- examples/circleiterate3.rb
+- examples/circlerecurse1.rb
+- examples/circlerecurse2.rb
+- examples/circlerecurseall.rb
+- examples/euclideangeo.rb
+- examples/evolution1.rb
+- examples/evolution2.rb
+- examples/evolution3.rb
 - examples/foreach.rb
+- examples/fuseaugeo.rb
 - examples/geodash.rb
 - examples/geodash2.rb
+- examples/gradientgeo.rb
 - examples/hellocrown.rb
 - examples/hellocrown2.rb
 - examples/hellocrownrecurse.rb
 - examples/helloworldcompact.rb
 - examples/helloworldexpanded.rb
+- examples/interbeziergeo1.rb
+- examples/interbeziergeo2.rb
+- examples/interbeziergeo3.rb
 - examples/multibezierbasic.rb
+- examples/offsetgeo.rb
 - examples/palette_circle.rb
 - examples/randomdash.rb
 - examples/range_examples.rb
@@ -79,11 +100,14 @@ test_files:
 - test/test_fitting.rb
 - test/test_frame.rb
 - test/test_geometry2D.rb
+- test/test_geovariety.rb
 - test/test_interbezier.rb
 - test/test_interpolation.rb
 - test/test_parametric_length.rb
 - test/test_render.rb
+- test/test_sample.rb
 - test/test_shape.rb
+- test/test_spiral.rb
 - test/test_style.rb
 - test/test_trace.rb
 - test/test_utils.rb