technical_graph 0.3.0 → 0.3.1

data/test/test_technical_autocolor.rb

@@ -77,7 +77,8 @@ class TestTechnicalAutocolor < Test::Unit::TestCase
       @tg.add_layer(layer_data_d, layer_params_d)
 
 
-      @tg.layers.last.data.size.should > 0
+      @tg.layers.last.raw_data.size.should > 0
+      @tg.layers.last.processed_data.size.should > 0
       @tg.layers.size.should == 4
 
       @tg.render

data/test/test_technical_axis_enlarge.rb

@@ -53,7 +53,8 @@ class TestTechnicalAxisEnlarge < Test::Unit::TestCase
       end
       @tg.add_layer(layer_data, layer_params)
       # should be added
-      @tg.layers.last.data.size.should > 0
+      @tg.layers.last.raw_data.size.should > 0
+      @tg.layers.last.processed_data.size.should > 0
       # checking ranger for layer
 
       @tg.render

data/test/test_technical_graph.rb

@@ -52,7 +52,8 @@ class TestTechnicalGraph < Test::Unit::TestCase
       @tg.layers.size.should == layers + 1
 
       layer = @tg.layers.last
-      layer.data.size.should == @data_size
+      layer.raw_data.size.should == @data_size
+      layer.processed_data.size.should == @data_size
     end
 
     should 'has ability to manipulate layers, add more data' do
@@ -60,11 +61,13 @@ class TestTechnicalGraph < Test::Unit::TestCase
       layer = @tg.layers.last
       layer.class.should == DataLayer
 
-      layer.data.size.should == @data_size
+      layer.raw_data.size.should == @data_size
+      layer.processed_data.size.should == @data_size
 
       # adding second data
       layer.append_data(@second_data)
-      layer.data.size.should == 2 * @data_size
+      layer.raw_data.size.should == 2 * @data_size
+      layer.processed_data.size.should == 2 * @data_size
 
       # @tg.render
       # @tg.image.save_to_file('samples/tests/test1.png')
@@ -73,29 +76,36 @@ class TestTechnicalGraph < Test::Unit::TestCase
     should 'has ability to filter records with similar x\'es' do
       @tg.add_layer
       layer = @tg.layers.last
-      layer.data.size.should == 0
+      layer.raw_data.size.should == 0
+      layer.processed_data.size.should == 0
       layer.append_data([{ :x => 0, :y => 1 }])
-      layer.data.size.should == 1
+      layer.raw_data.size.should == 1
+      layer.processed_data.size.should == 1
 
       # uniq check
       layer.append_data([{ :x => 0, :y => 1 }])
       layer.append_data([{ :x => 0, :y => 1 }])
-      layer.data.size.should == 1
+      layer.raw_data.size.should == 1
+      layer.processed_data.size.should == 1
       layer.append_data([{ :x => 2, :y => 1 }])
-      layer.data.size.should == 2
+      layer.raw_data.size.should == 2
+      layer.processed_data.size.should == 2
     end
 
     should 'has ability to filter bad records' do
       @tg.add_layer
       layer = @tg.layers.last
-      layer.data.size.should == 0
+      layer.raw_data.size.should == 0
+      layer.processed_data.size.should == 0
       layer.append_data([{ :x => 0, :y => 1 }])
-      layer.data.size.should == 1
+      layer.raw_data.size.should == 1
+      layer.processed_data.size.should == 1
 
       # uniq check
       layer.append_data([{ :z => 0, :y => 1 }])
       layer.append_data([{}])
-      layer.data.size.should == 1
+      layer.raw_data.size.should == 1
+      layer.processed_data.size.should == 1
     end
 
   end

data/test/test_technical_graph_axis.rb

@@ -70,7 +70,8 @@ class TestTechnicalGraphAxis < Test::Unit::TestCase
       ]
       @tg.add_layer(layer_data)
       # should be added
-      @tg.layers.last.data.size > 0
+      @tg.layers.last.raw_data.size > 0
+      @tg.layers.last.processed_data.size > 0
       # checking ranger for layer
 
       @tg.render
@@ -100,7 +101,8 @@ class TestTechnicalGraphAxis < Test::Unit::TestCase
       ]
       @tg.add_layer(layer_data)
       # should be added
-      @tg.layers.last.data.size > 1
+      @tg.layers.last.raw_data.size > 1
+      @tg.layers.last.processed_data.size > 1
 
       @tg.render
 
@@ -145,7 +147,8 @@ class TestTechnicalGraphAxis < Test::Unit::TestCase
       ]
       @tg.add_layer(layer_data)
       # should be added
-      @tg.layers.last.data.size > 0
+      @tg.layers.last.raw_data.size > 0
+      @tg.layers.last.processed_data.size > 0
       # checking ranger for layer
 
       @tg.render
@@ -212,7 +215,8 @@ class TestTechnicalGraphAxis < Test::Unit::TestCase
       ]
       @tg.add_layer(layer_data)
       # should be added
-      @tg.layers.last.data.size > 0
+      @tg.layers.last.raw_data.size > 0
+      @tg.layers.last.processed_data.size > 0
       # checking ranger for layer
 
       @tg.render
@@ -254,7 +258,8 @@ class TestTechnicalGraphAxis < Test::Unit::TestCase
       ]
       @tg.add_layer(layer_data)
       # should be added
-      @tg.layers.last.data.size > 0
+      @tg.layers.last.raw_data.size > 0
+      @tg.layers.last.processed_data.size > 0
       # checking ranger for layer
 
       @tg.render
@@ -292,7 +297,8 @@ class TestTechnicalGraphAxis < Test::Unit::TestCase
       end
       @tg.add_layer(layer_data)
       # should be added
-      @tg.layers.last.data.size > 0
+      @tg.layers.last.raw_data.size > 0
+      @tg.layers.last.processed_data.size > 0
       # checking ranger for layer
 
       @tg.render

data/test/test_technical_multilayer.rb

@@ -81,7 +81,8 @@ class TestTechnicalMultilayer < Test::Unit::TestCase
       @tg.add_layer(layer_data_d, layer_params_d)
 
 
-      @tg.layers.last.data.size.should > 0
+      @tg.layers.last.raw_data.size.should > 0
+      @tg.layers.last.processed_data.size.should > 0
       @tg.layers.size.should == 4
 
       @tg.render

data/test/test_technical_noise_removal.rb

@@ -0,0 +1,36 @@
+require 'helper'
+
+class TestTechnicalNoiseRemoval < Test::Unit::TestCase
+  context 'basic noise (wrong data) removal' do
+
+    should 'do linear dry test' do
+      layer_data = Array.new
+      size = 100
+      (0..size).each do |i|
+        layer_data << { :x => i.to_f, :y => 5.0 }
+      end
+      # noise, spike
+      layer_data << { :x => 50.1, :y => 12.0 }
+
+      layer_params = {
+        :noise_removal => true,
+        :noise_removal_level => 3,
+        :noise_removal_window_size => 10,
+      }
+
+      dl = DataLayer.new(layer_data, layer_params)
+      dlp = DataLayerProcessor.new(dl)
+
+      dlp.noise_removal.should == true
+      dlp.noise_removal_level.should == 3
+      dlp.noise_removal_window_size.should == 10
+
+      # start only noise removal for test
+      #dlp.noise_removal_process
+      # start everything
+      dl.process!
+
+    end
+  end
+
+end

data/test/test_technical_readme.rb

@@ -0,0 +1,207 @@
+require 'helper'
+
+class TestTechnicalReadme < Test::Unit::TestCase
+  context 'generate sample graphs using readme options description' do
+    setup do
+      @simple_data_array = [
+        { :x => 0, :y => 0 },
+        { :x => 1, :y => 1 },
+        { :x => 2, :y => 2 },
+        { :x => 3, :y => 2 },
+        { :x => 4, :y => 1 },
+        { :x => 5, :y => 0 },
+      ]
+      @simple_data_array_b = [
+        { :x => 0.5, :y => 0.5 },
+        { :x => 1.5, :y => 0.5 },
+        { :x => 2.5, :y => 1.5 },
+        { :x => 3.5, :y => 1.0 },
+        { :x => 4.5, :y => 1.5 },
+        { :x => 5.5, :y => 1.5 },
+      ]
+      @float_data_array = [
+        { :x => 0, :y => 0 },
+        { :x => 0.111, :y => 0.123 },
+        { :x => 1.222, :y => 1.456 },
+        { :x => 1.333, :y => 2.8756 },
+        { :x => 2.555, :y => 1.042 },
+        { :x => 2.888, :y => 0.988 },
+      ]
+    end
+
+    #
+    should 'create simplest graph' do
+      return # TODO remove it later, when all tests are done
+      @tg = TechnicalGraph.new
+      @tg.add_layer(@simple_data_array)
+      @tg.render
+      file_name = 'samples/readme/01_simplest.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_png.class.should == String
+      File.exist?(file_name).should == true
+    end
+
+    #
+    should 'create 2-layer graph' do
+      return # TODO remove it later, when all tests are done
+      @tg = TechnicalGraph.new
+      @tg.add_layer(@simple_data_array)
+      @tg.add_layer(@simple_data_array_b)
+      @tg.render
+      file_name = 'samples/readme/02_two_layers.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_png.class.should == String
+      File.exist?(file_name).should == true
+    end
+
+    #
+    should 'change ranges' do
+      return # TODO remove it later, when all tests are done
+      @tg = TechnicalGraph.new(
+        {
+          :x_min => -2,
+          :x_max => 10,
+          :y_min => -1,
+          :y_max => 10,
+        })
+      @tg.add_layer(@simple_data_array)
+      @tg.render
+      file_name = 'samples/readme/03_changed_ranges.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_png.class.should == String
+      File.exist?(file_name).should == true
+    end
+
+    should 'change ranges (fixed)' do
+      return # TODO remove it later, when all tests are done
+      @tg = TechnicalGraph.new(
+        {
+          :x_min => 1,
+          :x_max => 2,
+          :y_min => 1,
+          :y_max => 2,
+          :xy_behaviour => :fixed
+        })
+      @tg.add_layer(@simple_data_array)
+      @tg.render
+      file_name = 'samples/readme/04_changed_ranges_fixed.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_png.class.should == String
+      File.exist?(file_name).should == true
+    end
+
+    should 'fixed amount of axis' do
+      return # TODO remove it later, when all tests are done
+      @tg = TechnicalGraph.new(
+        {
+          :x_axis_fixed_interval => false,
+          :y_axis_fixed_interval => false,
+          :y_axis_count => 20,
+          :x_axis_count => 20,
+        })
+      @tg.add_layer(@simple_data_array)
+      @tg.render
+      file_name = 'samples/readme/05_axis_fixed_amount.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_png.class.should == String
+      File.exist?(file_name).should == true
+    end
+
+    should 'fixed axis interval' do
+      return # TODO remove it later, when all tests are done
+      @tg = TechnicalGraph.new(
+        {
+          :x_axis_fixed_interval => true,
+          :y_axis_fixed_interval => true,
+          :y_axis_interval => 0.8,
+          :x_axis_interval => 0.6,
+        })
+      @tg.axis.x_axis_interval.should == 0.6
+      @tg.axis.y_axis_interval.should == 0.8
+      @tg.add_layer(@simple_data_array)
+      @tg.axis.x_axis_interval.should == 0.6
+      @tg.axis.y_axis_interval.should == 0.8
+
+      # axis_x = @tg.axis.calc_axis(@simple_data_array.first[:x], @simple_data_array.last[:x], 0.1, nil, true)
+      # axis_y = @tg.axis.calc_axis(@simple_data_array.first[:y], @simple_data_array.last[:y], 0.1, nil, true)
+      # puts axis_x.inspect
+      # puts axis_y.inspect
+
+      @tg.render
+      file_name = 'samples/readme/06_axis_fixed_interval.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_png.class.should == String
+      File.exist?(file_name).should == true
+    end
+
+    should 'let choose axis label' do
+      return # TODO remove it later, when all tests are done
+      @tg = TechnicalGraph.new(
+        {
+          :x_axis_label => 'parameter',
+          :y_axis_label => 'value',
+          :axis_label_font_size => 36
+        })
+      @tg.add_layer(@simple_data_array)
+      @tg.render
+      file_name = 'samples/readme/07_axis_label.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_png.class.should == String
+      File.exist?(file_name).should == true
+    end
+
+
+    should 'test truncate string' do
+      #return # TODO remove it later, when all tests are done
+      @tg = TechnicalGraph.new(
+        {
+          :truncate_string => "%.3f"
+        })
+      @layer_params = {
+        :value_labels => true
+      }
+      @tg.add_layer(@float_data_array, @layer_params)
+      @tg.render
+      file_name = 'samples/readme/08a_truncate_string.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_png.class.should == String
+      File.exist?(file_name).should == true
+    end
+
+    should 'test truncate string 2' do
+      #return # TODO remove it later, when all tests are done
+      @tg = TechnicalGraph.new(
+        {
+          :truncate_string => "%.1f"
+        })
+      @layer_params = {
+        :value_labels => true
+      }
+      @tg.add_layer(@float_data_array, @layer_params)
+      @tg.render
+      file_name = 'samples/readme/08b_truncate_string.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_png.class.should == String
+      File.exist?(file_name).should == true
+    end
+
+  end
+end

data/test/test_technical_simple_graph.rb

@@ -49,7 +49,8 @@ class TestTechnicalSimpleGraph < Test::Unit::TestCase
       end
       @tg.add_layer(layer_data, layer_params)
       # should be added
-      @tg.layers.last.data.size.should > 0
+      @tg.layers.last.raw_data.size.should > 0
+      @tg.layers.last.processed_data.size.should > 0
       # checking ranger for layer
 
       @tg.render

data/test/test_technical_smoother.rb

@@ -34,17 +34,17 @@ class TestTechnicalSmoother < Test::Unit::TestCase
 
     should 'calculated vector has proper size and sum eq. 1.0' do
       @processor.generate_vector.should.kind_of? Array
-      @processor.generate_vector.size.should == @processor.level
+      @processor.generate_vector.size.should == @processor.simple_smoother_level
 
-      DataLayerProcessor::STRATEGIES.keys.each do |s|
-        @processor.strategy = s
-        @processor.strategy.should == s
+      DataLayerProcessor::SIMPLE_SMOOTHER_STRATEGIES.keys.each do |s|
+        @processor.simple_smoother_strategy = s
+        @processor.simple_smoother_strategy.should == s
 
         (1...10).each do |i|
-          @processor.level = i
-          @processor.level.should == i
+          @processor.simple_smoother_level = i
+          @processor.simple_smoother_level.should == i
 
-          @processor.generate_vector.size.should == @processor.level
+          @processor.generate_vector.size.should == @processor.simple_smoother_level
 
           s = 0.0
           @processor.generate_vector.each do |t|
@@ -59,17 +59,18 @@ class TestTechnicalSmoother < Test::Unit::TestCase
     end
 
     should 'processed data has the same size that old one' do
-      DataLayerProcessor::STRATEGIES.keys.each do |s|
-        @processor.strategy = s
-        @processor.strategy.should == s
+      DataLayerProcessor::SIMPLE_SMOOTHER_STRATEGIES.keys.each do |s|
+        @processor.simple_smoother_strategy = s
+        @processor.simple_smoother_strategy.should == s
         (1...9).each do |i|
-          @processor.level = i
-          @processor.level.should == i
+          @processor.simple_smoother_level = i
+          @processor.simple_smoother_level.should == i
 
-          @processor.generate_vector.size.should == @processor.level
+          @processor.generate_vector.size.should == @processor.simple_smoother_level
 
           new_data = @processor.process
-          new_data.size.should == @data_layer.data.size
+          new_data.size.should == @data_layer.raw_data.size
+          new_data.size.should == @data_layer.processed_data.size
 
           # add as new layer
           #@data_layer = DataLayer.new(@layer_data, @layer_params)
@@ -111,10 +112,9 @@ class TestTechnicalSmoother < Test::Unit::TestCase
 
       # process and add
       approx = layer_data_b = tg.layers[0].processor
-      approx.strategy = :gauss
-      approx.level = 9
-      approx.generate_vector
-      
+      approx.simple_smoother_strategy = :gauss
+      approx.simple_smoother_level = 9
+
       layer_data_b = approx.process
       layer_params_b = {
         :antialias => false,

data/test/test_technical_smoother_adv.rb

@@ -0,0 +1,115 @@
+require 'helper'
+
+class TestTechnicalSmootherAdv < Test::Unit::TestCase
+  context 'using additional X values in smoothing process' do
+
+    should 'calculate proper values' do
+      max = 2000
+
+      layer_data = Array.new
+      (0..max).each do |i|
+        x = -10.0 + (20.0 * i.to_f / max.to_f)
+        y = 10.0 * Math.cos(i.to_f * (2.0 * 3.14 / max.to_f))
+
+        y += rand * 4.0
+        x += rand * 1.5
+
+        layer_data << { :x => x, :y => y }
+      end
+      dl = DataLayer.new(layer_data)
+      dlp = DataLayerProcessor.new(dl)
+
+      level = 50
+
+      dlp.simple_smoother_strategy = :gauss
+      dlp.simple_smoother_level = level
+      dlp.simple_smoother_x = true
+      dlp.generate_vector
+
+      test_array = Array.new
+      x = 0.0
+      y = 2.0
+      level.times do
+        dp = DataPoint.xy(x, y + rand)
+        x += 1.0
+        test_array << dp
+      end
+      current_position = (test_array.size / 2.0).floor
+      current_position_point = test_array[current_position]
+
+      processed_yx = dlp.process_part_only_x(test_array, current_position_point)
+      processed_x = dlp.process_part_only_y(test_array)
+
+      puts processed_x.inspect
+      puts processed_yx.inspect
+
+
+    end
+
+
+    should 'create simple X smoothing' do
+      #return # TODO
+
+      tg = TechnicalGraph.new(
+        {
+          :width => 8000,
+          :height => 6000,
+
+          :legend => true,
+          :legend_auto => true,
+          :legend_width => 90,
+          :legend_margin => 60,
+          :legend_x => 50,
+          :legend_y => 50,
+        }
+      )
+      max = 2000
+
+      layer_data = Array.new
+      (0..max).each do |i|
+        x = -10.0 + (20.0 * i.to_f / max.to_f)
+        y = 10.0 * Math.cos(i.to_f * (2.0 * 3.14 / max.to_f))
+
+        y += rand * 4.0
+        x += rand * 1.5
+
+        layer_data << { :x => x, :y => y }
+      end
+
+      # adding simple layer
+      layer_params = {
+        :antialias => false,
+        :color => 'red',
+        :label => 'raw',
+        :value_labels => false,
+        :simple_smoother => false,
+        :simple_smoother_level => 1,
+        :simple_smoother_strategy => :gauss,
+        :simple_smoother_x => false
+      }
+      layer_params_c = layer_params.clone.merge(
+        {
+          :color => 'green',
+          :label => 'processed - level 100',
+          :simple_smoother_level => 100,
+          :simple_smoother => true
+        })
+      layer_params_d = layer_params_c.clone.merge(
+        {
+          :color => 'blue',
+          :simple_smoother_x => true
+        })
+
+      tg.add_layer(layer_data.clone, layer_params)
+      tg.add_layer(layer_data.clone, layer_params_c)
+      tg.add_layer(layer_data.clone, layer_params_d)
+
+      tg.render
+      tg.image_drawer.save_to_file('samples/tests/test_smoothing_x_values.png')
+    end
+
+
+  end
+
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: technical_graph
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Aleksander Kwiatkowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 +02:00
+date: 2011-10-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,6 +114,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files: 
+- DOCUMENTATION.textile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -121,8 +122,12 @@ files:
 - Rakefile
 - VERSION
 - lib/technical_graph.rb
+- lib/technical_graph/array.rb
 - lib/technical_graph/data_layer.rb
 - lib/technical_graph/data_layer_processor.rb
+- lib/technical_graph/data_layer_processor_noise_removal.rb
+- lib/technical_graph/data_layer_processor_simple_smoother.rb
+- lib/technical_graph/data_point.rb
 - lib/technical_graph/graph_axis.rb
 - lib/technical_graph/graph_color_library.rb
 - lib/technical_graph/graph_data_processor.rb
@@ -133,8 +138,11 @@ files:
 - test/test_technical_graph.rb
 - test/test_technical_graph_axis.rb
 - test/test_technical_multilayer.rb
+- test/test_technical_noise_removal.rb
+- test/test_technical_readme.rb
 - test/test_technical_simple_graph.rb
 - test/test_technical_smoother.rb
+- test/test_technical_smoother_adv.rb
 has_rdoc: true
 homepage: http://github.com/akwiatkowski/technical_graph
 licenses: