statsample 0.6.7 → 0.7.0

data/test/test_regression.rb

@@ -1,7 +1,8 @@
 $:.unshift(File.dirname(__FILE__)+'/../lib/')
 require 'statsample'
-require 'test/unit'
-class StatsampleRegressionTestCase < Test::Unit::TestCase
+require 'minitest/unit'
+MiniTest::Unit.autorun
+class StatsampleRegressionTestCase < MiniTest::Unit::TestCase
 	def test_parameters
     @x=[13,20,10,33,15].to_vector(:scale)
 		@y=[23,18,35,10,27	].to_vector(:scale)

data/test/test_svg_graph.rb

@@ -28,35 +28,35 @@ class StatsampleSvgGraphTestCase < Test::Unit::TestCase
     puts "Statsample::Graph::SvgHistogram.new not tested (no ruby-gsl)"
     end
   end
+  def assert_svg(msg=nil)
+    msg||="%s isn't a svg file"
+    Tempfile.open("svg") do |fp| 
+      yield fp
+      fp.close
+      fp.open
+      assert_match(/DOCTYPE svg/, fp.gets(nil), sprintf(msg,fp.path))
+    end
+  end
   def test_vector
-    file=@image_path+"/gdchart_bar.jpg"
     ar=[]
     (1..1000).each {|a|
       ar.push(rand(10))
     }
     vector=ar.to_vector
-    file=Tempfile.new("svggraph_default.svg").path
-    vector.svggraph_frequencies(file)
-    file=Tempfile.new("svggraph_bar.svg").path
-    vector.svggraph_frequencies(file,800,600,SVG::Graph::Bar,:graph_title=>'Bar')
-    assert(File.exists?(file))
-    file=Tempfile.new("svggraph_bar_horizontal.svg").path
-    vector.svggraph_frequencies(file,800,600,SVG::Graph::BarHorizontalNoOp,:graph_title=>'Horizontal Bar')
-    assert(File.exists?(file))
-    file=Tempfile.new("svggraph_pie.svg").path
-    vector.svggraph_frequencies(file,800,600,SVG::Graph::PieNoOp,:graph_title=>'Pie')
-    assert(File.exists?(file))		
+    assert_svg {|file| vector.svggraph_frequencies(file)}
+    assert_svg {|file| vector.svggraph_frequencies(file, 800, 600, SVG::Graph::Bar, :graph_title=>'Bar') }
+    assert_svg {|file| vector.svggraph_frequencies(file, 800, 600, SVG::Graph::BarHorizontalNoOp, :graph_title=>'Horizontal Bar') }
+    assert_svg {|file| vector.svggraph_frequencies(file,800,600, SVG::Graph::PieNoOp, :graph_title=>'Pie') }
     vector.type=:scale
     if Statsample.has_gsl?
     file=Tempfile.new("svg_histogram.svg").path
       hist=vector.svggraph_histogram(5)
       File.open(file,"wb") {|fp|
-              fp.write(hist.burn)
+        fp.write(hist.burn)
       }
       assert(File.exists?(file))
-      else
+    else
       puts "Statsample::Vector#svggraph_histogram.new not tested (no ruby-gsl)"
-  
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: statsample
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -03:00
+date: 2010-03-25 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: minimization
@@ -52,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.1.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: fastercsv
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
   type: :development
@@ -60,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.3
+        version: 2.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: gemcutter
@@ -70,7 +80,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -141,8 +151,7 @@ files:
 - lib/statsample/bivariate/tetrachoric.rb
 - lib/statsample/codification.rb
 - lib/statsample/combination.rb
-- lib/statsample/converter/csv18.rb
-- lib/statsample/converter/csv19.rb
+- lib/statsample/converter/csv.rb
 - lib/statsample/converter/spss.rb
 - lib/statsample/converters.rb
 - lib/statsample/crosstab.rb

data/lib/statsample/converter/csv18.rb

@@ -1,56 +0,0 @@
-module Statsample
-  class CSV < SpreadsheetBase
-    class << self
-      # Returns a Dataset  based on a csv file
-      #
-      # USE:
-      #     ds=Statsample::CSV.read("test_csv.csv")
-      def read(filename, empty=[''],ignore_lines=0,fs=nil,rs=nil)
-        require 'csv'
-        first_row=true
-        fields=[]
-        fields_data={}
-        ds=nil
-        line_number=0
-        
-        ::CSV.open(filename,'r',fs,rs) do |row|
-          line_number+=1
-          if(line_number<=ignore_lines)
-            #puts "Skip line"
-            next
-          end
-          row.collect!{|c|
-          c.to_s
-          }
-          if first_row
-            fields=extract_fields(row)
-            ds=Statsample::Dataset.new(fields)
-            first_row=false
-          else
-            rowa=process_row(row,empty)
-            ds.add_case(rowa,false)
-          end
-        end
-        convert_to_scale_and_date(ds,fields)
-        ds.update_valid_data
-        ds
-      end
-      # Save a Dataset on a csv file
-      #
-      # USE:
-      #     Statsample::CSV.write(ds,"test_csv.csv")            
-      def write(dataset,filename, convert_comma=false,*opts)
-        require 'csv'            
-        writer=::CSV.open(filename,'w',*opts)
-        writer << dataset.fields
-        dataset.each_array do |row|
-          if(convert_comma)
-            row.collect!{|v| v.to_s.gsub(".",",")}
-          end
-          writer << row
-        end
-        writer.close
-      end
-    end
-  end
-end