panomosity 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9429ab38b6928e5b0e731cdedbeeab3e95afba20549ee2acb01c3ee0afda0bf
-  data.tar.gz: 2aa31fef07b269239cfd09bd4e877f5d897caf7f09eef1c13079564b293e4fa1
+  metadata.gz: ec66a2f30f7e065a735367c5f5758ff9bb274c5c180a75de429135d137582874
+  data.tar.gz: a59ce44c2c0a37b05ae323b46881345b8e0bdb213233abd16ae5a47780270ca9
 SHA512:
-  metadata.gz: 9c594323f23c9e778737b6a309cce0b006f9e64c500f978075ab9da6e7fec5448df780a90fd4332b0562ccffb597261397e31fdaaa2bae7315009c15a60e6a1f
-  data.tar.gz: 0a1e815356032d427326cecce3ee4668dbbad3b806499854088bf27c061919f075015d5ebf08c379294f3c63a723b765180461720453c62fee31c05d16b70510
+  metadata.gz: 2bd782706baca58410c3e4c0e1cce4a4914c086874fe0976f4ebe490a489181ce5321d66692f42398064aef6116db563990c6331ba334700473906717541b704
+  data.tar.gz: b8afce3fd3dec4ce71a7cf9bcbe3445c5ef4691d092784440560b725fc04e75db46346ba0ac4f99f65bb1622ea65b757e20d2c9be1c3fa53a78a5e6157d94a9d

data/Gemfile.lock

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

data/lib/panomosity/control_point.rb

@@ -174,5 +174,16 @@ module Panomosity
         y1.floor == o.y1.floor &&
         y2.floor == o.y2.floor
     end
+
+    def recalculate_pixel_distance
+      r = i1.r * Math::PI / 180
+      self.prx = i1.d - i2.d + Math.cos(r) * (x2 - x1) - Math.sin(r) * (y2 - y1)
+      self.pry = i1.e - i2.e + Math.cos(r) * (y2 - y1) - Math.sin(r) * (x2 - x1)
+      self.prdist = Math.sqrt(prx ** 2 + pry ** 2)
+    end
+
+    def detailed_info
+      "#{to_s.sub(/\n/, '')} dist #{dist.round(4)} pixel_dist #{px.round(4)},#{py.round(4)},#{pdist.round(4)} pixel_r_dist #{prx.round(4)},#{pry.round(4)},#{prdist.round(4)} conn_type #{conn_type}"
+    end
   end
 end

data/lib/panomosity/optimisation_variable.rb

@@ -1,5 +1,6 @@
 module Panomosity
   class OptimisationVariable
+    START_LINE = 'v'
     @@attributes = %i(w h f v Ra Rb Rc Rd Re Eev Er Eb r p y TrX TrY TrZ Tpy Tpp j a b c d e g t Va Vb Vc Vd Vx Vy Vm n)
 
     def self.parse(pto_file)
@@ -12,7 +13,8 @@ module Panomosity
 
     def self.parse_line(line)
       parts = line.split(' ')
-      if parts.first == 'v'
+      if parts.first == START_LINE
+        parts = parts[1..(parts.count-1)]
         data = parts.each_with_object({}) do |part, hash|
           attribute = @@attributes.find { |attr| part[0] == attr.to_s }
           next unless attribute
@@ -60,5 +62,9 @@ module Panomosity
       line_values = @@attributes.map { |attribute| "#{attribute}#{self.send(attribute)}" }
       "v #{line_values.join(' ')}\n"
     end
+
+    def attributes
+      @attributes.keep_if { |k,_| !%i(raw).include?(k) }
+    end
   end
 end

data/lib/panomosity/optimizer.rb

@@ -0,0 +1,114 @@
+require 'panomosity/utils'
+
+module Panomosity
+  class Optimizer
+    include Panomosity::Utils
+
+    attr_accessor :panorama, :images, :control_points, :optimisation_variables, :logger
+
+    def initialize(panorama)
+      @panorama = panorama
+      @images = @panorama.images
+      @control_points = @panorama.control_points
+      @optimisation_variables = @panorama.optimisation_variables
+      @logger = @panorama.logger
+    end
+
+    def run
+      variables_to_optimize = optimisation_variables.map { |v| v.attributes.keys }.flatten.uniq.sort
+      if variables_to_optimize == [:d, :e]
+        run_position_optimizer
+      elsif variables_to_optimize == [:r]
+        run_roll_optimizer
+      else
+        logger.error 'no optimization strategy found'
+      end
+    end
+
+    def run_position_optimizer
+      ds = images.map(&:d).uniq.sort
+      es = images.map(&:e).uniq.sort
+
+      # start horizontally
+      xs = []
+      es.each_with_index do |e, i_e|
+        next if i_e == es.count - 1
+        ds.each_with_index do |d, i_d|
+          next if i_d == ds.count - 1
+          image1 = images.find { |i| i.d == d && i.e == e }
+          image2 = images.find { |i| i.d == ds[i_d+1] && i.e == e }
+          id1, id2 = *[image1.id, image2.id].minmax
+          cps = control_points.select { |cp| cp.conn_type == :horizontal && cp.n1 == id1 && cp.n2 == id2 }
+          xs << cps.map(&:prx)
+        end
+      end
+
+      xs.flatten!
+      x_avg, x_std = *calculate_average_and_std(name: :x, values: xs, logger: logger)
+      logger.debug 'filter first standard deviations'
+      xs.select! { |x| (x - x_avg).abs < x_std }
+      x_avg, x_std = *calculate_average_and_std(name: :x, values: xs, logger: logger)
+      logger.debug 'filter second standard deviations'
+      xs.select! { |x| (x - x_avg).abs < x_std }
+      x_avg, _ = *calculate_average_and_std(name: :x, values: xs, logger: logger)
+
+      d_map = {}
+      ds.each_with_index do |d, i|
+        if d == ds.first
+          d_map[d] = d
+        else
+          d_map[d] = d + -x_avg * i
+        end
+      end
+      logger.debug "created d_map #{d_map}"
+
+      # vertical
+      ys = []
+      ds.each_with_index do |d, i_d|
+        next if i_d == ds.count - 1
+        es.each_with_index do |e, i_e|
+          next if i_e == es.count - 1
+          image1 = images.find { |i| i.d == d && i.e == e }
+          image2 = images.find { |i| i.d == d && i.e == es[i_e+1] }
+          id1, id2 = *[image1.id, image2.id].minmax
+          cps = control_points.select { |cp| cp.conn_type == :vertical && cp.n1 == id1 && cp.n2 == id2 }
+          ys << cps.map(&:pry)
+        end
+      end
+
+      ys.flatten!
+      y_avg, y_std = *calculate_average_and_std(name: :y, values: ys, logger: logger)
+      logger.debug 'filter first standard deviations'
+      ys.select! { |y| (y - y_avg).abs < y_std }
+      y_avg, y_std = *calculate_average_and_std(name: :y, values: ys, logger: logger)
+      logger.debug 'filter second standard deviations'
+      ys.select! { |y| (y - y_avg).abs < y_std }
+      y_avg, _ = *calculate_average_and_std(name: :y, values: ys, logger: logger)
+
+      e_map = {}
+      es.each_with_index do |e, i|
+        if e == es.first
+          e_map[e] = e
+        else
+          e_map[e] = e + -y_avg * i
+        end
+      end
+      logger.debug "created e_map #{e_map}"
+
+      logger.debug 'updating image attributes'
+      images.each do |image|
+        image.d = d_map[image.d]
+        image.e = e_map[image.e]
+      end
+    end
+
+    def run_roll_optimizer
+      r = images.map(&:r).first
+      amount = (0.2 * (images.count)).floor
+      pairs = control_points.group_by { |cp| [cp.n1, cp.n2] }.sort_by { |_, cps|  [calculate_average_and_std(values: cps.map(&:prdist)).first, -cps.count] }[0..(amount-1)]
+      pairs.select{|_,cps| cps.first.conn_type == :horizontal}.each do |pair, cps|
+        logger.debug "#{pair} #{cps.map(&:detailed_info).join("\n")}"
+      end
+    end
+  end
+end

data/lib/panomosity/panorama.rb

@@ -0,0 +1,24 @@
+module Panomosity
+  class Panorama
+    attr_accessor :images, :control_points, :variable, :optimisation_variables, :logger
+
+    def initialize(input, logger = nil)
+      @input = input
+      @images = Image.parse(@input)
+      @variable = PanoramaVariable.parse(@input).first
+      ControlPoint.parse(@input)
+      @control_points = ControlPoint.calculate_distances(@images, @variable)
+      @optimisation_variables = OptimisationVariable.parse(@input)
+
+      if logger
+        @logger = logger
+      else
+        @logger = Logger.new(STDOUT)
+        @logger.level = Logger::DEBUG
+        @logger.formatter = proc do |severity, datetime, progname, msg|
+          "[#{datetime}][#{severity}] #{msg}\n"
+        end
+      end
+    end
+  end
+end

data/lib/panomosity/runner.rb

@@ -2,6 +2,8 @@ require 'logger'
 
 module Panomosity
   class Runner
+    include Panomosity::Utils
+
     attr_reader :logger
 
     AVAILABLE_COMMANDS = %w(
@@ -16,6 +18,7 @@ module Panomosity
       generate_border_line_control_points
       get_detailed_control_point_info
       merge_image_parameters
+      optimize
       prepare_for_pr0ntools
       remove_anchor_variables
       standardize_roll
@@ -96,8 +99,8 @@ module Panomosity
       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))
+        average_x, x_std = *calculate_average_and_std(name: :x, values: cps.map(&:px), logger: logger)
+        average_y, y_std = *calculate_average_and_std(name: :y, values: cps.map(&:py), logger: logger)
 
         max_removal = ((@options[:max_removal] || 0.2) * cps.count).floor
         min_cps = 8
@@ -283,19 +286,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, distance_std = *calculate_average_and_std(name: :distance, values: control_points_of_pair.map(&:pdist))
+      average_distance, distance_std = *calculate_average_and_std(name: :distance, values: control_points_of_pair.map(&:pdist), logger: logger)
       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"
       # For logging
-      calculate_average_and_std(name: :distance, values: horizontal_control_points_of_pair.map(&:pdist))
+      calculate_average_and_std(name: :distance, values: horizontal_control_points_of_pair.map(&:pdist), logger: logger)
 
       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, distance_std = *calculate_average_and_std(name: :distance, values: control_points_of_pair.map(&:pdist))
+      average_distance, distance_std = *calculate_average_and_std(name: :distance, values: control_points_of_pair.map(&:pdist), logger: logger)
       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"
       # For logging
-      calculate_average_and_std(name: :distance, values: vertical_control_points_of_pair.map(&:pdist))
+      calculate_average_and_std(name: :distance, values: vertical_control_points_of_pair.map(&:pdist), logger: logger)
 
       logger.info 'finding unconnected image pairs'
       ds = images.map(&:d).uniq.sort
@@ -600,7 +603,7 @@ module Panomosity
       control_points = ControlPoint.calculate_distances(images, panorama_variable)
 
       control_points.each do |cp|
-        logger.debug "#{cp.to_s.sub(/\n/, '')} dist #{cp.dist.round(4)} pixel_dist #{cp.px.round(4)},#{cp.py.round(4)},#{cp.pdist.round(4)} pixel_r_dist #{cp.prx.round(4)},#{cp.pry.round(4)},#{cp.prdist.round(4)} conn_type #{cp.conn_type}"
+        logger.debug cp.detailed_info
       end
     end
 
@@ -623,6 +626,24 @@ module Panomosity
       save_file
     end
 
+    def optimize
+      logger.info 'optimizing'
+      panorama = Panorama.new(@input_file, logger)
+      optimizer = Optimizer.new(panorama)
+      optimizer.run
+
+      @lines = @input_file.each_line.map do |line|
+        image = optimizer.images.find { |i| i.raw == line }
+        if image
+          image.to_s
+        else
+          next line
+        end
+      end.compact
+
+      save_file
+    end
+
     def prepare_for_pr0ntools
       logger.info 'preparing for pr0ntools'
 
@@ -689,10 +710,10 @@ module Panomosity
       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)
+      average_roll, roll_std = *calculate_average_and_std(name: :roll, values: rolls, logger: logger)
       new_rolls = rolls.select { |r| (r - average_roll).abs < roll_std }
       logger.info "removed #{rolls.count - new_rolls.count} outliers"
-      average_roll, _ = *calculate_average_and_std(name: :roll, values: new_rolls)
+      average_roll, _ = *calculate_average_and_std(name: :roll, values: new_rolls, logger: logger)
       logger.info "converting all rolls to #{average_roll}"
 
       @lines = @input_file.each_line.map do |line|
@@ -725,13 +746,5 @@ module Panomosity
 
       @output_file.close
     end
-
-    def calculate_average_and_std(name: 'value', 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/utils.rb

@@ -0,0 +1,11 @@
+module Panomosity
+  module Utils
+    def calculate_average_and_std(name: 'value', values: [], logger: nil)
+      average_value = values.reduce(:+).to_f / values.count
+      logger.debug "average #{name}: #{average_value}" if logger
+      value_std = Math.sqrt(values.map { |v| (v - average_value) ** 2 }.reduce(:+) / (values.count - 1))
+      logger.debug "#{name} std: #{value_std}" if logger
+      [average_value, value_std]
+    end
+  end
+end

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

data/lib/panomosity.rb

@@ -1,8 +1,11 @@
 require 'panomosity/control_point'
 require 'panomosity/image'
 require 'panomosity/optimisation_variable'
+require 'panomosity/optimizer'
+require 'panomosity/panorama'
 require 'panomosity/panorama_variable'
 require 'panomosity/runner'
+require 'panomosity/utils'
 require 'panomosity/version'
 require 'pathname'
 require 'fileutils'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panomosity
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Oliver Garcia
@@ -78,8 +78,11 @@ files:
 - lib/panomosity/control_point.rb
 - lib/panomosity/image.rb
 - lib/panomosity/optimisation_variable.rb
+- lib/panomosity/optimizer.rb
+- lib/panomosity/panorama.rb
 - lib/panomosity/panorama_variable.rb
 - lib/panomosity/runner.rb
+- lib/panomosity/utils.rb
 - lib/panomosity/version.rb
 - panomosity.gemspec
 homepage: https://github.com/elevatesystems/panomosity