panomosity 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d31e6f456b80f0429a224a93939514115dd1f944e4a01c0e4b3992347d9c870
-  data.tar.gz: fc71c2b94cb75a36ed249b728a9382350fc72ac5562c3dd644f31a5289969523
+  metadata.gz: 29ffa367e9aa586c70f99b092cc16361d782228b43d7403f526480736f077786
+  data.tar.gz: 6d0d06a32d28236b703ed604189c3a9548badf9ddf8c883aacbf846bee165296
 SHA512:
-  metadata.gz: 7b2697110bf392a3d7f15371ca57e7835a149c8dd371cc45317559a005b57ba2b8edbc696d7e87e1f12111a325567e066988eba06614cd61b8b9c1a3d9cd4dd8
-  data.tar.gz: b55224d26f9b7f0e45fbcc26478517c39e3c80482dc9f16496b811cc94352bef5dc1e62173abc784ace3dc73c4df0f0adf0cda642897a3df8eb79d10445d8b50
+  metadata.gz: 285fa9879122939d631ed74395948b702c626e2e0104d1cd9d1a346c58bbbcb90c8d134826d97c9c70e94256e582b4afdbff95cdc6b988c04e12ca10bce0beb0
+  data.tar.gz: 98c7bcabe7f5a3e2d4435c8d44fbe5496a7ec3bdbe5b5dff498d7d6022f346e65bc76bae1f7cfe4c1dfaeb68bd57acd65bc2980a1daf60293c657e7541bd8e5d

data/Gemfile.lock

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

data/lib/panomosity/control_point.rb

@@ -3,7 +3,7 @@
 
 module Panomosity
   class ControlPoint
-    @@attributes = %i(n N x y X Y t)
+    @@attributes = %i(n N x y X Y t g)
     @@calculated_attributes = %i(dist px py pdist prx pry prdist conn_type i1 i2)
 
     def self.parse(pto_file, cp_type: nil, compact: false)
@@ -161,18 +161,27 @@ module Panomosity
       vertical? || horizontal?
     end
 
+    def generated?
+      !g.nil?
+    end
+
+    def not_generated?
+      !generated?
+    end
+
     def to_s
-      line_values = @@attributes.map { |attribute| "#{attribute}#{self.send(attribute)}" }
+      attrs = generated? ? @@attributes : (@@attributes - %i(g))
+      line_values = attrs.map { |attribute| "#{attribute}#{self.send(attribute)}" }
       "c #{line_values.join(' ')}\n"
     end
 
     def ==(o)
       n1 == o.n1 &&
-        n2 == o.n2 &&
-        x1.floor == o.x1.floor &&
-        x2.floor == o.x2.floor &&
-        y1.floor == o.y1.floor &&
-        y2.floor == o.y2.floor
+      n2 == o.n2 &&
+      x1.floor == o.x1.floor &&
+      x2.floor == o.x2.floor &&
+      y1.floor == o.y1.floor &&
+      y2.floor == o.y2.floor
     end
 
     def recalculate_pixel_distance

data/lib/panomosity/neighborhood.rb

@@ -14,25 +14,28 @@ module Panomosity
     end
 
     def calculate
+      # Do not include generated control points in neighborhood calculations
+      pair_control_points = pair.control_points.select(&:not_generated?)
+
       # Instead of setting a static distance use a distance that is dependent on the type of connection
       if pair.horizontal?
         @pair_distance = (pair.first_image.h * 0.1).round
-        @control_points = pair.control_points.select do |cp|
+        @control_points = pair_control_points.select do |cp|
           cp.x1.between?(center.x1 - distance, center.x1 + distance) && cp.y1.between?(center.y1 - pair_distance, center.y1 + pair_distance)
         end
       else
         @pair_distance = (pair.first_image.w * 0.1).round
-        @control_points = pair.control_points.select do |cp|
+        @control_points = pair_control_points.select do |cp|
           cp.x1.between?(center.x1 - pair_distance, center.x1 + pair_distance) && cp.y1.between?(center.y1 - distance, center.y1 + distance)
         end
       end
 
-      @prdist_avg, @prdist_std = *calculate_average_and_std(values: control_points.map(&:prdist))
-      @prx_avg, @prx_std = *calculate_average_and_std(values: control_points.map(&:prx))
-      @pry_avg, @pry_std = *calculate_average_and_std(values: control_points.map(&:pry))
+      @prdist_avg, @prdist_std = *calculate_average_and_std(values: control_points.map(&:prdist), ignore_empty: true)
+      @prx_avg, @prx_std = *calculate_average_and_std(values: control_points.map(&:prx), ignore_empty: true)
+      @pry_avg, @pry_std = *calculate_average_and_std(values: control_points.map(&:pry), ignore_empty: true)
 
       # add in control points that have similar distances (within std)
-      @control_points_within_std = pair.control_points.select { |c| c.prdist.between?(center.prdist - prdist_std, center.prdist + prdist_std) }
+      @control_points_within_std = pair_control_points.select { |c| c.prdist.between?(center.prdist - prdist_std, center.prdist + prdist_std) }
       self
     end
 

data/lib/panomosity/neighborhood_group.rb

@@ -98,7 +98,7 @@ 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 { |cp| cp.raw }
+      @control_points = neighborhoods.map(&:control_points_within_std).flatten.uniq(&:raw)
       @x_avg = calculate_average(values: control_points.map(&:px))
       @y_avg = calculate_average(values: control_points.map(&:py))
       @prdist_avg = center.prdist_avg

data/lib/panomosity/pair.rb

@@ -23,7 +23,7 @@ module Panomosity
       end
 
       def good_control_points_to_keep
-        @pairs.map(&:good_control_points_to_keep).flatten.uniq { |cp| cp.raw }
+        @pairs.map(&:good_control_points_to_keep).flatten.uniq(&:raw)
       end
 
       def unconnected
@@ -83,6 +83,12 @@ module Panomosity
       log_detailed_neighborhood_info(name: :vertical, pairs: @vertical_pairs)
     end
 
+    def self.calculate_neighborhood_groups
+      NeighborhoodGroup.parse_info(@panorama)
+      NeighborhoodGroup.calculate(name: :horizontal, pairs: @horizontal_pairs)
+      NeighborhoodGroup.calculate(name: :vertical, pairs: @vertical_pairs)
+    end
+
     def self.log_detailed_neighborhood_info(name: :horizontal, pairs: [])
       return unless @panorama.options[:very_verbose]
       logger.debug "showing #{name} pair information"
@@ -98,12 +104,6 @@ module Panomosity
       end
     end
 
-    def self.calculate_neighborhood_groups
-      NeighborhoodGroup.parse_info(@panorama)
-      NeighborhoodGroup.calculate(name: :horizontal, pairs: @horizontal_pairs)
-      NeighborhoodGroup.calculate(name: :vertical, pairs: @vertical_pairs)
-    end
-
     def self.info
       logger.debug "total number of control points: #{@pairs.map(&:control_points).flatten.count}"
       logger.debug 'displaying horizontal pair info'
@@ -117,6 +117,25 @@ module Panomosity
         logger.debug "control points: x_dist,x_std: #{x_dist},#{x_std} | y_dist,y_std: #{y_dist},#{y_std} | dist,std: #{dist},#{std}"
         logger.debug "total number of neighborhoods: #{pair.neighborhoods.count}"
         logger.debug "total number single cp neighborhoods: #{pair.neighborhoods.select{|n| n.control_points.count == 1}.count}"
+        logger.debug "total number generated control points: #{pair.control_points.select(&:generated?).count}"
+        pair.neighborhoods.each do |neighborhood|
+          logger.debug neighborhood.info
+          logger.debug "neighborhood: distance,pair_distance: #{neighborhood.distance},#{neighborhood.pair_distance} | total number of control points: #{neighborhood.control_points.count}"
+          logger.debug "neighborhood: center prdist: #{neighborhood.center.prdist} | total number of control points within std: #{neighborhood.control_points_within_std.count}"
+        end
+      end
+      logger.debug 'displaying vertical pair info'
+      logger.debug "total number of vertical control points: #{@vertical_pairs.map(&:control_points).flatten.count}"
+      @vertical_pairs.each do |pair|
+        logger.debug pair.info
+        logger.debug "total number of control points: #{pair.control_points.count}"
+        x_dist, x_std = *calculate_average_and_std(values: pair.control_points.map(&:prx))
+        y_dist, y_std = *calculate_average_and_std(values: pair.control_points.map(&:pry))
+        dist, std = *calculate_average_and_std(values: pair.control_points.map(&:prdist))
+        logger.debug "control points: x_dist,x_std: #{x_dist},#{x_std} | y_dist,y_std: #{y_dist},#{y_std} | dist,std: #{dist},#{std}"
+        logger.debug "total number of neighborhoods: #{pair.neighborhoods.count}"
+        logger.debug "total number single cp neighborhoods: #{pair.neighborhoods.select{|n| n.control_points.count == 1}.count}"
+        logger.debug "total number generated control points: #{pair.control_points.select(&:generated?).count}"
         pair.neighborhoods.each do |neighborhood|
           logger.debug neighborhood.info
           logger.debug "neighborhood: distance,pair_distance: #{neighborhood.distance},#{neighborhood.pair_distance} | total number of control points: #{neighborhood.control_points.count}"
@@ -133,7 +152,7 @@ module Panomosity
     end
 
     def to_s
-      pair.map(&:id)
+      pair.map(&:id).to_s.gsub(' ', '')
     end
 
     def info
@@ -181,7 +200,7 @@ module Panomosity
     end
 
     def good_control_points_to_keep(count: 3)
-      control_points_to_keep = good_neighborhoods_within_std(count: count).map(&:control_points_within_std).flatten.uniq { |cp| cp.raw }
+      control_points_to_keep = good_neighborhoods_within_std(count: count).map(&:control_points_within_std).flatten.uniq(&:raw)
 
       # Keep all our control points if we have less than 10
       if control_points.count >= 10

data/lib/panomosity/panorama.rb

@@ -19,11 +19,16 @@ module Panomosity
       Pair.calculate_neighborhoods(self)
       control_points_to_keep = Pair.good_control_points_to_keep
       bad_control_points = control_points.reject { |cp| control_points_to_keep.map(&:raw).include?(cp.raw) }
-      control_point_ratio = bad_control_points.count.to_f / control_points.count
+      far_control_points = control_points.select { |cp| cp.prdist > 50 }
+      control_points_to_clean = (bad_control_points + far_control_points).uniq(&:raw)
+
+      # log warnings
+      control_point_ratio = control_points_to_clean.count.to_f / control_points.count
       logger.warn "Removing more than 30% (#{(control_point_ratio*100).round(4)}%) of control points. May potentially cause issues." if control_point_ratio >= 0.3
       control_point_pair_ratio = Pair.without_enough_control_points(ignore_connected: true).count.to_f / Pair.all.count
       logger.warn "More than 50% (#{(control_point_pair_ratio*100).round(4)}%) of pairs have fewer than 3 control points. May potentially cause issues." if control_point_pair_ratio >= 0.5
-      bad_control_points
+
+      control_points_to_clean
     end
 
     def fix_unconnected_image_pairs
@@ -122,6 +127,9 @@ module Panomosity
           control_point[:x] += i.w * 0.25
           control_point[:X] += i.w * 0.25
         end
+        # marks the control point as generated
+
+        control_point[:g] = 0
         control_point.to_s
       end.join
     end

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.19'
+  VERSION = '0.1.20'
 end

data/lib/panomosity.rb

@@ -58,7 +58,7 @@ module Panomosity
         options[:verbose] = v
       end
 
-      parser.on('-v', '--vverbose', 'Run very verbosely') do |v|
+      parser.on('-vv', '--vverbose', 'Run very verbosely') do |v|
         options[:very_verbose] = v
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panomosity
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Oliver Garcia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler