panomosity 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e32fb89b5812b7f726cf6c322423d4e816aa103bde59bd5deef4bd6fb2279d4
-  data.tar.gz: 2aae7a094ad7bccd73af5d6042a799e29cd4ce1bd0e1bdd81d187b24e82b33f5
+  metadata.gz: d7d65793e972cbf9d8367f1530b60910163841a24a5517bbfea254a21e0a583c
+  data.tar.gz: cac1ed82d1567b8b0ede45b4697dd273d9383d1f951ee5eace80b95734d7e1f5
 SHA512:
-  metadata.gz: d7d24392ffec1de2c6fb59b3ed8c4e03a59e91529ecc3a2a7c5d4bcca26383ea2a089dfd0f5e044fe2604c57b802324f6f4859532211b212808ea5a97aadc918
-  data.tar.gz: f41fae931324dc129bb4f9b8499f86d0d209dd9bcf9c396b768e988d9ab8abe62eec1032601335da697a7df69ebb9f26ae5c271b1fd040b66a6b3e8d6a021611
+  metadata.gz: 8476d6c4ef2615c878b18232b929828ac03db88d133c654b9b04104db64ef370e5c13feb5f47573f8513397f612cc48a8c19d3fa551b01e9586c9332bdee68e9
+  data.tar.gz: f411883b85d56232f9b38f67161c80e32d682f56c842d87b1d0b31352c157748065922751f1ce99315e9cf67151c2ff173e09def1c6da8b08f3ca1295aa43d5e

data/.gitignore

@@ -12,3 +12,6 @@
 
 # RubyMine
 /.idea/
+
+# Gem build
+panomosity*.gem

data/Gemfile.lock

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

data/lib/panomosity.rb

@@ -36,10 +36,14 @@ module Panomosity
         options[:without_cropping] = wc
       end
 
-      parser.on('--remove-equal-signs', 'Do not crop when running "crop_centers" (usually when the original run failed)') do |eq|
+      parser.on('--remove-equal-signs', 'Remove equal signs when running "convert_equaled_image_parameters" (necessary when parsing the PTO file using Panotools)') do |eq|
         options[:remove_equal_signs] = eq
       end
 
+      parser.on('--max-removal FRAC', Float, 'Max fraction of control points to be removed when running "clean_control_points" that are statistical outliers') do |mr|
+        options[:max_removal] = mr
+      end
+
       parser.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
         options[:verbose] = v
       end

data/lib/panomosity/control_point.rb

@@ -47,7 +47,9 @@ module Panomosity
         point1 = image1.to_cartesian(cp.x1, cp.y1)
         point2 = image2.to_cartesian(cp.x2, cp.y2)
 
-        angle = Math.acos(point1[0] * point2[0] + point1[1] * point2[1] + point1[2] * point2[2])
+        product = point1[0] * point2[0] + point1[1] * point2[1] + point1[2] * point2[2]
+        product = 1.0 if product > 1.0
+        angle = Math.acos(product)
         radius = (panorama_variable.w / 2.0) / Math.tan((panorama_variable.v * Math::PI / 180) / 2)
 
         distance = angle * radius
@@ -59,9 +61,9 @@ module Panomosity
         x2 = (image2.w / 2.0) - cp.x2 + image2.d
         y2 = (image2.h / 2.0) - cp.y2 + image2.e
 
-        pixel_distance = Math.sqrt((x1 - x2)**2 + (y1 - y2)**2)
         cp.px = x1 - x2
         cp.py = y1 - y2
+        pixel_distance = Math.sqrt(cp.px**2 + cp.py**2)
         cp.pdist = pixel_distance
         cp.conn_type = image1.d == image2.d ? :vertical : :horizontal
       end

data/lib/panomosity/runner.rb

@@ -6,6 +6,7 @@ module Panomosity
 
     AVAILABLE_COMMANDS = %w(
       check_position_changes
+      clean_control_points
       convert_equaled_image_parameters
       convert_horizontal_lines
       convert_translation_parameters
@@ -83,6 +84,52 @@ module Panomosity
       save_file
     end
 
+    def clean_control_points
+      logger.info 'cleaning control points'
+      # Since this is very exact, having many outliers in control points distances will cause errors
+      images = Image.parse(@input_file)
+      panorama_variable = PanoramaVariable.parse(@input_file).first
+      ControlPoint.parse(@input_file)
+      control_points = ControlPoint.calculate_distances(images, panorama_variable)
+
+      bad_control_points = []
+      min_control_points = 5
+      control_points.group_by { |cp| [cp.n1, cp.n2] }.select { |_, cps| cps.count > min_control_points }.each do |pair, cps|
+        logger.debug "cleaning pair #{pair.first} <> #{pair.last}"
+        average_x, x_std = *calculate_average_and_std(name: :x, values: cps.map(&:px))
+        average_y, y_std = *calculate_average_and_std(name: :y, values: cps.map(&:py))
+
+        max_removal = ((@options[:max_removal] || 0.2) * cps.count).floor
+        min_cps = 10
+        max_iterations = 10
+        iterations = 0
+        bad_cps = cps.select { |cp| (cp.px - average_x).abs >= x_std || (cp.py - average_y).abs >= y_std }
+        while bad_cps.count > max_removal && (cps.count - bad_cps.count) >= min_cps && iterations <= max_iterations
+          x_std *= 1.1
+          y_std *= 1.1
+          iterations += 1
+          bad_cps = cps.select { |cp| (cp.px - average_x).abs >= x_std || (cp.py - average_y).abs >= y_std }
+        end
+
+        logger.info "found #{bad_cps.count} outliers"
+        bad_control_points << bad_cps if bad_cps.count <= max_removal
+      end
+      bad_control_points.flatten!
+
+      logger.info "removing #{bad_control_points.count} control points"
+      @lines = @input_file.each_line.map do |line|
+        control_point = ControlPoint.parse_line(line)
+        # skip this control point if we found it
+        if control_point && bad_control_points.find { |bad_cp| bad_cp.raw == control_point.raw }
+          next
+        else
+          next line
+        end
+      end.compact
+
+      save_file
+    end
+
     def convert_equaled_image_parameters
       logger.info 'converting equaled image parameters'
       images = Image.parse(@input_file)
@@ -231,25 +278,19 @@ module Panomosity
       horizontal_control_points, vertical_control_points = *control_points.partition { |cp| cp.conn_type == :horizontal }
       control_points_of_pair = horizontal_control_points.group_by { |cp| [cp.n1, cp.n2] }.sort_by { |_, members| members.count }.last.last
       logger.debug "found horizontal pair #{control_points_of_pair.first.n1} <> #{control_points_of_pair.first.n2} with #{control_points_of_pair.count} connections"
-      average_distance = control_points_of_pair.map(&:pdist).reduce(:+).to_f / control_points_of_pair.count
-      logger.debug "average distance #{average_distance}"
-      dist_std = Math.sqrt(control_points_of_pair.map { |cp| (cp.pdist - average_distance) ** 2 }.reduce(:+) / (control_points_of_pair.count - 1))
-      logger.debug "dist std: #{dist_std}"
-      horizontal_control_points_of_pair = control_points_of_pair.select { |cp| (cp.pdist - average_distance).abs < dist_std }
+      average_distance, distance_std = *calculate_average_and_std(name: :distance, values: control_points_of_pair.map(&:pdist))
+      horizontal_control_points_of_pair = control_points_of_pair.select { |cp| (cp.pdist - average_distance).abs < distance_std }
       logger.info "removed #{control_points_of_pair.count - horizontal_control_points_of_pair.count} outliers"
-      new_average_distance = horizontal_control_points_of_pair.map(&:pdist).reduce(:+).to_f / horizontal_control_points_of_pair.count
-      logger.info "new average #{new_average_distance}"
+      # For logging
+      calculate_average_and_std(name: :distance, values: horizontal_control_points_of_pair.map(&:pdist))
 
       control_points_of_pair = vertical_control_points.group_by { |cp| [cp.n1, cp.n2] }.sort_by { |_, members| members.count }.last.last
       logger.debug "found vertical pair #{control_points_of_pair.first.n1} <> #{control_points_of_pair.first.n2} with #{control_points_of_pair.count} connections"
-      average_distance = control_points_of_pair.map(&:pdist).reduce(:+).to_f / control_points_of_pair.count
-      logger.debug "average distance #{average_distance}"
-      dist_std = Math.sqrt(control_points_of_pair.map { |cp| (cp.pdist - average_distance) ** 2 }.reduce(:+) / (control_points_of_pair.count - 1))
-      logger.debug "dist std: #{dist_std}"
-      vertical_control_points_of_pair = control_points_of_pair.select { |cp| (cp.pdist - average_distance).abs < dist_std }
+      average_distance, distance_std = *calculate_average_and_std(name: :distance, values: control_points_of_pair.map(&:pdist))
+      vertical_control_points_of_pair = control_points_of_pair.select { |cp| (cp.pdist - average_distance).abs < distance_std }
       logger.info "removed #{control_points_of_pair.count - vertical_control_points_of_pair.count} outliers"
-      new_average_distance = vertical_control_points_of_pair.map(&:pdist).reduce(:+).to_f / vertical_control_points_of_pair.count
-      logger.info "new average #{new_average_distance}"
+      # For logging
+      calculate_average_and_std(name: :distance, values: vertical_control_points_of_pair.map(&:pdist))
 
       logger.info 'finding unconnected image pairs'
       ds = images.map(&:d).uniq.sort
@@ -298,10 +339,35 @@ module Panomosity
                 control_point = vertical_control_points_of_pair.first
               end
 
+              x_diff = control_point.x2 - control_point.x1
+              y_diff = control_point.y2 - control_point.y1
+
+              x1 = x_diff <= 0 ? -x_diff + 15 : 0
+              y1 = y_diff <= 0 ? -y_diff + 15 : 0
+
               control_point[:n] = pair[:pair].first.id
               control_point[:N] = pair[:pair].last.id
-              logger.debug "adding control point connecting #{control_point.n1} <> #{control_point.n2}"
-              control_point.to_s
+              control_point[:x] = x1
+              control_point[:X] = x1 + x_diff
+              control_point[:y] = y1
+              control_point[:Y] = y1 + y_diff
+
+              logger.debug "adding control points connecting #{control_point.n1} <> #{control_point.n2}"
+              i = images.first
+              3.times.map do
+                if control_point.conn_type == :horizontal
+                  control_point[:x] += 5
+                  control_point[:X] += 5
+                  control_point[:y] += i.h * 0.25
+                  control_point[:Y] += i.h * 0.25
+                else
+                  control_point[:x] += i.w * 0.25
+                  control_point[:X] += i.w * 0.25
+                  control_point[:y] += 5
+                  control_point[:Y] += 5
+                end
+                control_point.to_s
+              end.join
             end + [line]
           else
             next line
@@ -315,10 +381,36 @@ module Panomosity
             else
               control_point = vertical_control_points_of_pair.first
             end
+
+            x_diff = control_point.x2 - control_point.x1
+            y_diff = control_point.y2 - control_point.y1
+
+            x1 = x_diff <= 0 ? -x_diff + 15 : 0
+            y1 = y_diff <= 0 ? -y_diff + 15 : 0
+
             control_point[:n] = fake_control_point[:n]
             control_point[:N] = fake_control_point[:N]
+            control_point[:x] = x1
+            control_point[:X] = x1 + x_diff
+            control_point[:y] = y1
+            control_point[:Y] = y1 + y_diff
+
             logger.debug "replacing unrealistic control point connecting #{control_point.n1} <> #{control_point.n2}"
-            control_point.to_s
+            i = images.first
+            3.times.map do
+              if control_point.conn_type == :horizontal
+                control_point[:x] += 5
+                control_point[:X] += 5
+                control_point[:y] += i.h * 0.25
+                control_point[:Y] += i.h * 0.25
+              else
+                control_point[:x] += i.w * 0.25
+                control_point[:X] += i.w * 0.25
+                control_point[:y] += 5
+                control_point[:Y] += 5
+              end
+              control_point.to_s
+            end.join
           else
             next line
           end
@@ -566,20 +658,24 @@ module Panomosity
     def standardize_roll
       logger.info 'standardizing roll'
       images = Image.parse(@input_file)
-      rolls = images.map(&:r)
-      average_roll = rolls.reduce(:+).to_f / rolls.count
-      logger.debug "average roll: #{average_roll}"
-      roll_std = Math.sqrt(rolls.map { |r| (r - average_roll) ** 2 }.reduce(:+) / (rolls.count - 1))
-      logger.debug "roll std: #{roll_std}"
+      panorama_variable = PanoramaVariable.parse(@input_file).first
+      ControlPoint.parse(@input_file)
+      control_points = ControlPoint.calculate_distances(images, panorama_variable)
+      max_count = (images.count * 0.5).ceil - 1
+      pairs = control_points.group_by { |cp| [cp.n1, cp.n2] }.sort_by { |_, members| -members.count }[0..max_count]
+      image_ids = pairs.map { |image_ids, _| image_ids }.flatten.uniq
+      rolls = images.select { |image| image_ids.include?(image.id) }.map(&:r)
+
+      average_roll, roll_std = *calculate_average_and_std(name: :roll, values: rolls)
       new_rolls = rolls.select { |r| (r - average_roll).abs < roll_std }
       logger.info "removed #{rolls.count - new_rolls.count} outliers"
-      new_average_roll = new_rolls.reduce(:+).to_f / new_rolls.count
-      logger.info "converting all rolls to #{new_average_roll}"
+      average_roll, _ = *calculate_average_and_std(name: :roll, values: new_rolls)
+      logger.info "converting all rolls to #{average_roll}"
 
       @lines = @input_file.each_line.map do |line|
         image = images.find { |i| i.raw == line }
         if image
-          image.r = new_average_roll
+          image.r = average_roll
           image.to_s
         else
           next line
@@ -606,5 +702,13 @@ module Panomosity
 
       @output_file.close
     end
+
+    def calculate_average_and_std(name:, values: [])
+      average_value = values.reduce(:+).to_f / values.count
+      logger.debug "average #{name}: #{average_value}"
+      value_std = Math.sqrt(values.map { |v| (v - average_value) ** 2 }.reduce(:+) / (values.count - 1))
+      logger.debug "#{name} std: #{value_std}"
+      [average_value, value_std]
+    end
   end
 end

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

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