panomosity 0.1.31 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccef3c9690bcf25e476c65a9f25ef883049ccb26f98695dc58a7b0b8bdf5f868
-  data.tar.gz: e31c54fb190df4d63892dff79b6ccfae9e233cf63b6aae8ade8ad05c983299a6
+  metadata.gz: 50e125a826a4accf978aa182be59f36de59c7697254b3eabd27b6fb831fb319d
+  data.tar.gz: 4b53136c72ddba3fd1515cd5b9aea76fa747abfff344ad9e485ad2026e407209
 SHA512:
-  metadata.gz: 4921ab8f4d713a3e92ba8bab50a8ae3412e05ac7dabe7deb1344fc46434c1064f3fae845e2219f5888deebd87be050c1a9e71566cd92998aa2bd7d704d051954
-  data.tar.gz: b48fdc2849592a0015efa842080b49ede5dadb48ef0a394c9d8a0ffe2e9f30ce6705717ed7abf2d11d3bfabdf42a4810507b0467eae81727a4bbb87ac22a2e06
+  metadata.gz: 21a995367c4d62e67ccbdda9a18587cd7ddefc3399e585307bb8b47c7390276074889f8cccbc267c062eed3a46052dc55796fe0280ad9e27635642a758f0de73
+  data.tar.gz: da2f34870a506e6b32d4a2be111b614fe2056b049df905d9c5738efa13ffb64c0f45fe02ac4b86f042ee8c692b7610e032ef8f0e0e94ddc835bc925226e79728

data/Gemfile.lock

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

data/lib/panomosity/control_point.rb

@@ -4,7 +4,7 @@
 module Panomosity
   class ControlPoint
     @@attributes = %i(n N x y X Y t g)
-    @@calculated_attributes = %i(dist px py pdist prx pry prdist conn_type i1 i2 roll)
+    @@calculated_attributes = %i(dist px py pdist prx pry prdist conn_type i1 i2)
 
     def self.parse(pto_file, cp_type: nil, compact: false)
       @control_points = pto_file.each_line.map do |line|
@@ -55,31 +55,26 @@ module Panomosity
         distance = angle * radius
         cp.dist = distance
 
+        cp.i1 = image1
+        cp.i2 = image2
+
         # pixel distance
-        x1 = (image1.w / 2.0) - cp.x1 + image1.d
-        y1 = (image1.h / 2.0) - cp.y1 + image1.e
-        x2 = (image2.w / 2.0) - cp.x2 + image2.d
-        y2 = (image2.h / 2.0) - cp.y2 + image2.e
+        # NOTE d,e distances are highest on the top-left and lowest at the bottom-right
+        #      control point coordinates are highest on bottom-right and lowest on the top-left
+        x1 = (cp.i1.w / 2.0) - cp.x1 + cp.i1.d
+        y1 = (cp.i1.h / 2.0) - cp.y1 + cp.i1.e
+        x2 = (cp.i2.w / 2.0) - cp.x2 + cp.i2.d
+        y2 = (cp.i2.h / 2.0) - cp.y2 + cp.i2.e
 
         cp.px = x1 - x2
         cp.py = y1 - y2
         cp.pdist = Math.sqrt(cp.px ** 2 + cp.py ** 2)
 
         # pixel distance including roll
-        cp.conn_type = image1.column == image2.column ? :vertical : :horizontal
         r = image1.r * Math::PI / 180
-
-        if cp.conn_type == :horizontal
-          cp.roll = Math.atan(-(cp.y2 - cp.y1) / (cp.x2 - cp.x1)) * 180.0 / Math::PI
-        else
-          cp.roll = Math.atan((cp.x2 - cp.x1) / (cp.y2 - cp.y1)) * 180.0 / Math::PI
-        end
-        cp.prx = image1.d - image2.d + Math.cos(r) * (cp.x2 - cp.x1) - Math.sin(r) * (cp.y2 - cp.y1)
-        cp.pry = image1.e - image2.e + Math.cos(r) * (cp.y2 - cp.y1) + Math.sin(r) * (cp.x2 - cp.x1)
+        cp.prx = Math.cos(r) * cp.px - Math.sin(r) * cp.py
+        cp.pry = Math.cos(r) * cp.py + Math.sin(r) * cp.px
         cp.prdist = Math.sqrt(cp.prx ** 2 + cp.pry ** 2)
-
-        cp.i1 = image1
-        cp.i2 = image2
       end
     end
 
@@ -192,14 +187,9 @@ module Panomosity
 
     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.prx = Math.cos(r) * px - Math.sin(r) * py
+      self.pry = Math.cos(r) * py + Math.sin(r) * px
       self.prdist = Math.sqrt(prx ** 2 + pry ** 2)
-      if conn_type == :horizontal
-        self.roll = Math.atan(-(y2 - y1) / (x2 - x1)) * 180.0 / Math::PI
-      else
-        self.roll = Math.atan((x2 - x1) / (y2 - y1)) * 180.0 / Math::PI
-      end
     end
 
     def detailed_info

data/lib/panomosity/optimizer.rb

@@ -30,15 +30,17 @@ module Panomosity
         logger.info "applying custom values of xh_avg: #{xh_avg}, yh_avg: #{yh_avg}, xv_avg: #{xv_avg}, yv_avg: #{yv_avg}"
       end
 
-      Pair.calculate_neighborhoods(panorama)
-      Pair.calculate_neighborhood_groups
+      unless xh_avg && yh_avg && xv_avg && yv_avg
+        Pair.calculate_neighborhoods(panorama)
+        Pair.calculate_neighborhood_groups
+      end
 
       ds = images.map(&:d).uniq.sort
       es = images.map(&:e).uniq.sort
 
       # get the average error for the best neighborhood group
-      x_avg = xh_avg || NeighborhoodGroup.horizontal.first.x_avg
-      y_avg = yv_avg || NeighborhoodGroup.vertical.first.y_avg
+      x_avg = xh_avg || NeighborhoodGroup.horizontal.first.rx_avg
+      y_avg = yv_avg || NeighborhoodGroup.vertical.first.ry_avg
 
       # start horizontally
       d_map = {}
@@ -55,8 +57,8 @@ module Panomosity
       logger.debug "created e_map #{e_map}"
 
       # add in the other offset
-      x_avg = xv_avg || NeighborhoodGroup.vertical.first.x_avg
-      y_avg = yh_avg || NeighborhoodGroup.horizontal.first.y_avg
+      x_avg = xv_avg || NeighborhoodGroup.vertical.first.rx_avg
+      y_avg = yh_avg || NeighborhoodGroup.horizontal.first.ry_avg
 
       de_map = {}
       d_map.each_with_index do |(dk,dv),di|

data/lib/panomosity/utils.rb

@@ -20,5 +20,15 @@ module Panomosity
       logger.debug "average #{name}: #{average_value}" if logger
       average_value
     end
+
+    def remove_outliers(method: :value, values: [], logger: nil)
+      avg, std = *calculate_average_and_std(values: values.map(&method))
+      while std >= 0.1
+        values.select! { |c| (avg - c.send(method)).abs <= std }
+        avg, std = *calculate_average_and_std(values: values.map(&method))
+        logger.debug [avg , std, values.count].to_s if logger
+      end
+      values
+    end
   end
 end

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.31'
+  VERSION = '0.1.32'
 end

metadata

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