plot_statistics 1.2.0 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/bin/plot_statistics

@@ -13,20 +13,24 @@ ARGV.each do |filename|
   lines = file.readlines
   file.close
 
-  puts "\n"
-  puts '##########################'
-  puts "#   #{filename}"
-  puts '##########################'
-  puts "\n"
-
+  puts "Analyzing #{filename}"
+  printf "Importing Clams"
   clams = lines.map do |line|
-    x, y = line.strip.split("\t")
+    line = line.strip.split("\t")
+    next if line.empty?
+    x, y = line
+    printf "."
     PlotStatistics::Clam.new(:x => x, :y => y)
-  end
+  end.compact
 
+  puts "Running Ripley's K analysis of plot"
   actual_plot = PlotStatistics::ClamPlot.new(clams)
+
+  puts "Running Monte Carlo Simulations of plot"
   monte_carlo = PlotStatistics::MonteCarlo.new(actual_plot.number_of_clams)
 
   output_filename = filename + '.ripleys_k.csv'
   PlotStatistics::Output.new(:clam_plot => actual_plot, :monte_carlo => monte_carlo).write_to_file(output_filename)
+
+  puts "Done™"
 end

data/lib/plot_statistics/clam.rb

@@ -11,5 +11,10 @@ class PlotStatistics
     def self.create_random
       new( :x => rand(100), :y => rand(100) )
     end
+
+    def ==(other)
+      return super(other) unless other.kind_of?(PlotStatistics::Clam)
+      self.x == other.x && self.y == other.y
+    end
   end
 end

data/lib/plot_statistics/clam_plot.rb

@@ -14,6 +14,12 @@ class PlotStatistics
     end
 
     def self.create_random(number_of_clams)
+      clams = []
+      while clams.size < 100 do
+        new_clam = Clam.create_random
+        next if clams.any? { |clam| clam == new_clam }
+        clams << new_clam
+      end
       clams = (1..number_of_clams).map { Clam.create_random }
       new(clams)
     end
@@ -51,21 +57,30 @@ class PlotStatistics
     def calculate_stats
       (1..MAX_RADIUS).each do |radius|
 
-        sums = clams.inject(0.0) do |sum, clam|
-          clams_inside_circle = clam.distances.select { |distance| distance <= radius }
+        k_t = calculate_k_t(radius)
+        l_t = calculate_l_t(k_t, radius)
 
-          circle_proportion = Circle.new(:clam => clam, :radius => radius).proportion_inside_plot
-          reciprocal_proportion = 1.0 / circle_proportion
+        stats.k_ts << k_t
+        stats.l_ts << l_t
+      end
+    end
 
-          reciprocal_proportion * clams_inside_circle.size
-        end
+    def calculate_k_t(radius)
+      sums = clams.inject(0.0) do |sum, clam|
+        clams_inside_circle = clam.distances.select { |distance| distance <= radius }
 
-        k_t = AREA_OF_PLOT * sums / (number_of_clams ** 2)
-        l_t = radius - Math.sqrt( k_t / Math::PI)
+        circle_proportion = Circle.new(:clam => clam, :radius => radius).proportion_inside_plot
+        reciprocal_proportion = 1.0 / circle_proportion
 
-        stats.k_ts << k_t
-        stats.l_ts << l_t
+        inner_sum = reciprocal_proportion * clams_inside_circle.size
+        sum += inner_sum
       end
+
+      AREA_OF_PLOT * sums / (number_of_clams ** 2)
+    end
+
+    def calculate_l_t(k_t, radius)
+      radius - Math.sqrt( k_t / Math::PI)
     end
   end
 end

data/plot_statistics.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{plot_statistics}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Asa Wilson"]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Asa Wilson