panomosity 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbd6beccb0c42b2ad204db45a1f3c9a8af1d82abcec9a7b20de5ce10bc4d1e0a
-  data.tar.gz: 7032d40ff5ece97452818775cbe2357628bfe3be8038e7707036ce5e5ea6cb6e
+  metadata.gz: 75a840caab3ec6ccf1d6ac9a815037041c2b9b8fa5fb241185f8e5f7fac47371
+  data.tar.gz: 1abc680b6613331381b61047072df57f30242f188bea2e0ba4be1eb433065966
 SHA512:
-  metadata.gz: d148842633604ee5b2130fd23fca98dd4848fa1908efb4419c5ae64fbf03f97a2ea1a1919eafe724651b015d075ff864fa719fd3d8425682ea1e84a3bb4fed5f
-  data.tar.gz: c83028b274f45a79bd78b559a98b81397378398ded959e7a2d7ee1ee0d861e669221ce54ae7db9a4c02c0b39896595a842585acaeb1eb27886698cd639522832
+  metadata.gz: 3828862db188158ee5e1101cdff98649c2e90ef9d314f6e370a2ca0d6743b7da88cf9c87571205d554142dae69dd29bfa32eb25ebf68ade0333443673b49d282
+  data.tar.gz: c076ec3e926bfe49972868766660bfe9d72d5fdcc81441943da4a8d5f29eaffc8f57909d142049b523ad1dc054b128aa6dc0a334e877291adc8df369db684afb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    panomosity (0.1.28)
+    panomosity (0.1.29)
 
 GEM
   remote: https://rubygems.org/

data/lib/panomosity/neighborhood_group.rb

@@ -82,6 +82,9 @@ module Panomosity
 
       neighborhood_groups.max_by(5) { |ng| ng.control_points.count }.each do |ng|
         logger.debug "#{ng.prdist_avg} #{ng.prdist_std} #{ng.control_points.count} x#{ng.x_avg} y#{ng.y_avg}"
+        logger.debug "#{calculate_average(values: ng.control_points.map(&:pdist))} x#{calculate_average(values: ng.control_points.map(&:px))} y#{calculate_average(values: ng.control_points.map(&:py))}"
+
+        ng.control_points.each { |point| logger.debug point.detailed_info }
       end
 
       self.neighborhood_groups = neighborhood_groups.sort_by { |ng| -ng.control_points.count }
@@ -99,8 +102,8 @@ module Panomosity
     def calculate
       @neighborhoods = total_neighborhoods.select { |n| (n.prdist_avg - center.prdist_avg).abs <= center.prdist_std }
       @control_points = neighborhoods.map(&:control_points_within_std).flatten.uniq(&:raw)
-      @x_avg = calculate_average(values: control_points.map(&:prx))
-      @y_avg = calculate_average(values: control_points.map(&:pry))
+      @x_avg = calculate_average(values: control_points.map(&:px))
+      @y_avg = calculate_average(values: control_points.map(&:py))
       @prdist_avg = center.prdist_avg
       @prdist_std = center.prdist_std
       self

data/lib/panomosity/optimizer.rb

@@ -93,25 +93,32 @@ module Panomosity
       # we grab the top 5 neighborhood groups and get the average distance for them and average that
       dist_avg = calculate_average_distance
 
-      r -= 0.05
+      r -= 0.01
       logger.debug "current roll #{r}"
       new_dist_avg = recalculate_average_distance(roll: r)
       logger.debug "avg: #{dist_avg} new_avg: #{new_dist_avg}"
 
+      operation_map = { :- => 'subtracting', :+ => 'adding' }
       if new_dist_avg < dist_avg
-        logger.debug 'found that subtracting roll will decrease distances, resetting roll...'
         operation = :-
+        logger.debug "found that #{operation_map[operation]} roll will decrease distances, resetting roll..."
       else
-        logger.debug 'found that adding roll will decrease distances, resetting roll...'
         operation = :+
+        logger.debug "found that #{operation_map[operation]} roll will decrease distances, resetting roll..."
         r = original_roll
-        r += 0.05
+        r += 0.01
         logger.debug "current roll #{r}"
         new_dist_avg = recalculate_average_distance(roll: r)
       end
 
+      logger.debug "avg: #{dist_avg} new_avg: #{new_dist_avg}"
+      if new_dist_avg > dist_avg
+        logger.debug "found that #{operation_map[operation]} roll will also increase distances, leaving roll unchanged "
+        r = original_roll
+      end
+
       while new_dist_avg <= dist_avg
-        r = r.send(operation, 0.05)
+        r = r.send(operation, 0.01)
         logger.debug "current roll #{r}"
         dist_avg = new_dist_avg
         new_dist_avg = recalculate_average_distance(roll: r)

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.29'
+  VERSION = '0.1.30'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panomosity
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
 platform: ruby
 authors:
 - Oliver Garcia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler