gerbilcharts 0.2.4 → 0.2.5

data/lib/gerbilcharts/version.rb

@@ -2,7 +2,7 @@ module GerbilCharts
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_lines.rb

@@ -8,90 +8,34 @@ class TestLines  < Test::Unit::TestCase
   
    def setup
      @test_vector_tm1 = []
-     @test_vector_tm2 = []
      @test_vector_tm3 = []
      tbeg = Time.local( 1978, "jun", 5, 9, 10, 0, 0)
      sbeg = tbeg
      sec_inc = 50
      
      for i in (0..20)
-      @test_vector_tm1 << [sbeg + i*sec_inc, i*sec_inc*1000 ]
-      @test_vector_tm2 << [sbeg + i*sec_inc, i*sec_inc*1200 ]
+      @test_vector_tm1 << [sbeg + i*sec_inc, i*sec_inc*250*rand() ]
       @test_vector_tm3 << [sbeg + i*sec_inc, i*sec_inc*1000*rand() ]
     end
 
     @mod1 = GerbilCharts::Models::TimeSeriesGraphModel.new("External Gateway")
     @mod1.add_tuples @test_vector_tm1
   
-    @mod2 = GerbilCharts::Models::TimeSeriesGraphModel.new("209.216.22.220")
-    @mod2.add_tuples @test_vector_tm2
-  
     @mod3 = GerbilCharts::Models::TimeSeriesGraphModel.new("udldev Print Server")
     @mod3.add_tuples @test_vector_tm3
   
     @modgroup = GerbilCharts::Models::GraphModelGroup.new("Hosts")
-    @modgroup.add(@mod1)
-    @modgroup.add(@mod2)
     @modgroup.add(@mod3)
+    @modgroup.add(@mod1)
     
-    setup_bucketized_models()
 
    end
   
-  def setup_bucketized_models
-    # bucketized models
-     modbucket1 = GerbilCharts::Models::BucketizedTimeSeriesGraphModel.new("Out Bw",60)
-     tbeg = Time.local( 1978, "jun", 5, 9, 10, 0, 0)
-     sbeg = tbeg
-     
-     #second with some gaps
-    sbeg = tbeg
-    test_vector_bucket_1 = []
-    test_vector_bucket_1 << [sbeg + 60, 1000 ]
-    test_vector_bucket_1 << [sbeg + 120, 1000 ]
-    test_vector_bucket_1 << [sbeg + 180, 1000 ]
-    test_vector_bucket_1 << [sbeg + 239, 1000 ]
-    test_vector_bucket_1 << [sbeg + 295, 1000 ]
-    test_vector_bucket_1 << [sbeg + 296, 1000 ]
-    test_vector_bucket_1 << [sbeg + 297, 5000 ]
-    test_vector_bucket_1 << [sbeg + 298, 1000 ]
-    test_vector_bucket_1 << [sbeg + 360, 1000 ]
-    test_vector_bucket_1 << [sbeg + 420, 1000 ]
-    test_vector_bucket_1 << [sbeg + 480, 1000 ]
-    test_vector_bucket_1 << [sbeg + 530, 1000 ]
-    test_vector_bucket_1 << [sbeg + 604, 1000 ]
-    test_vector_bucket_1 << [sbeg + 800, 1000 ]
-    modbucket1.add_tuples(test_vector_bucket_1)
-    
-     #second with some gaps
-    modbucket2 = GerbilCharts::Models::BucketizedTimeSeriesGraphModel.new("In Bw",60)
-    sbeg = tbeg
-    test_vector_bucket_2 = []
-    test_vector_bucket_2 << [sbeg + 10, 1800 ]
-    test_vector_bucket_2 << [sbeg + 20, 2600 ]
-    test_vector_bucket_2 << [sbeg + 22, 1000 ]
-    test_vector_bucket_2 << [sbeg + 60, 1000 ]
-    test_vector_bucket_2 << [sbeg + 120, 1900 ]
-    test_vector_bucket_2 << [sbeg + 180, 700 ]
-    test_vector_bucket_2 << [sbeg + 240, 5000 ]
-    test_vector_bucket_2 << [sbeg + 301, 1000 ]
-    test_vector_bucket_2 << [sbeg + 350, 1000 ]
-    test_vector_bucket_2 << [sbeg + 420, 100 ]
-    test_vector_bucket_2 << [sbeg + 470, 500 ]
-    test_vector_bucket_2 << [sbeg + 540, 1000 ]
-    modbucket2.add_tuples(test_vector_bucket_2)
-
-    @modgroupbucketized = GerbilCharts::Models::GraphModelGroup.new("Bandwidth")
-    @modgroupbucketized .add(modbucket1)
-    @modgroupbucketized .add(modbucket2)
-    
-  end
-  
 
   # test a line chart
   def test_line_1
  
-    mychart = GerbilCharts::Charts::AreaChart.new( :width => 350, :height => 200, :style => 'brushmetal.css')
+    mychart = GerbilCharts::Charts::AreaChart.new( :width => 450, :height => 250, :style => 'inline:brushmetal.css')
     mychart.setmodelgroup(@modgroup)
     mychart.render('/tmp/sq_linechart1.svg')
     

data/test/test_negatives.rb

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestLines  < Test::Unit::TestCase
+
+   attr_reader  :test_vector_tm1
+   attr_reader  :test_vector_tm2
+   attr_reader  :mod1, :mod2, :modbucket1
+  
+   def setup
+     @test_vector_tm3 = []
+     tbeg = Time.local( 1978, "jun", 5, 9, 10, 0, 0)
+     sbeg = tbeg
+     sec_inc = 50
+     
+	 range = (-7000..+4000)
+     for i in (0..20)
+      @test_vector_tm3 << [sbeg + i*sec_inc, range.min + range.count * rand() ]
+     end
+
+  
+    @mod3 = GerbilCharts::Models::TimeSeriesGraphModel.new("udldev Print Server")
+    @mod3.add_tuples @test_vector_tm3
+  
+    @modgroup = GerbilCharts::Models::GraphModelGroup.new("Hosts")
+    @modgroup.add(@mod3)
+    
+   end
+  
+  # test a line chart
+  def test_line_1
+ 
+    mychart = GerbilCharts::Charts::AreaChart.new( :width => 350, :height => 200, :style => 'inline:brushmetal.css',
+												   :enabletimetracker => true )
+    mychart.setmodelgroup(@modgroup)
+    mychart.render('/tmp/neg_linechart1.svg')
+    
+  end   
+   
+end

data/test/test_ranges.rb

@@ -132,4 +132,25 @@ class TestRanges < Test::Unit::TestCase
 	assert_equal(rr.ldelta,10800)
   end
 
+  def test_negative_range
+
+  	debugger 
+
+    r = GerbilCharts::Models::RawRange.new
+  	[-11000,19920,20001].each do |v|
+		r.update v
+	end
+
+	rr = GerbilCharts::Models::RoundRange.new(r)
+	assert_equal(rr.rmax,50000)
+	assert_equal(rr.rmin,-20000)
+	assert_equal(rr.lmax,25000,"checking ideal label interval")
+
+	r.update(-18000)
+	rr = GerbilCharts::Models::RoundRange.new(r)
+	assert_equal(rr.lmax,25000,"checking ideal label interval for a 100K interval")
+
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gerbilcharts
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Vivek Rajagopalan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 +05:30
+date: 2009-10-27 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -160,5 +160,6 @@ test_files:
 - test/test_bar.rb
 - test/test_models.rb
 - test/test_charts.rb
+- test/test_negatives.rb
 - test/test_scaling.rb
 - test/test_Scratch.rb