panomosity 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 960aaa7a596d0b4a03dd08035f2ba977f213611ec966c854377d50e6579d6bc9
-  data.tar.gz: 31897c3519e3dc653663da142195af8098c70227498c7a78c557f58829038f56
+  metadata.gz: 03fdb416c8d39656632189a9880aa52e3e60fff0dfc56b50183b59b3102f2f24
+  data.tar.gz: 6c52de6b53ca852186783e9dc20245b54b4cf1c1b36aaf58bc7604d396bd922f
 SHA512:
-  metadata.gz: 6257b5e9f06245063f35a7c9c5694100022b589af83c2c8804c7c244d4025437af8be95d16d0508363107479d7895f822b133f2c0bff9bd220ff37fd04b41180
-  data.tar.gz: 84838c53dc43d6e071223fedee1ea2c1f8a957a966d77f2867ad8cfc77a345e73bd72e05403b74484fdd17b086d4d1aba92bea58163aed1c526410ff25ede68b
+  metadata.gz: 077a3ad888b535c4c0d6a0602122e96a9cd23569ec9488dd699e3ef0a6bedc05f91df3e7780075b554e7447d10927ab9a48d257369a8de900653911ac1cf426c
+  data.tar.gz: 5362b8ad8a925074425e0df89397e2eb488a904553e9369eb4b94594df0f5f49a1210f54296ec9624d47b17039b1bcf7dd75ad6497ba139ab8bca38c59bc9612

data/lib/panomosity/image.rb

@@ -110,7 +110,8 @@ module Panomosity
       subline_values = (@@attributes - %i(Vm n)).map do |attribute|
         value = self.send(attribute)
         if @@equaled_attributes.include?(attribute) && !options[:without_equal_signs]
-          if value == 0.0
+          # Floats are distinctly not equaled attributes
+          if value == 0 && value.is_a?(Integer)
             "#{attribute}=#{value.to_i}"
           else
             "#{attribute}#{value}"

data/lib/panomosity/panorama.rb

@@ -107,9 +107,9 @@ module Panomosity
 
       logger.debug "twice reducing #{name} neighborhood std outliers"
       avg, std = *calculate_average_and_std(values: total_neighborhoods.map { |n| n[:prdist_std] })
-      total_neighborhoods.select! { |n| (avg - n[:prdist_std]).abs < std }
+      total_neighborhoods.select! { |n| (avg - n[:prdist_std]).abs <= std }
       avg, std = *calculate_average_and_std(values: total_neighborhoods.map { |n| n[:prdist_std] })
-      total_neighborhoods.select! { |n| (avg - n[:prdist_std]).abs < std }
+      total_neighborhoods.select! { |n| (avg - n[:prdist_std]).abs <= std }
       neighborhood_group = total_neighborhoods.map do |neighborhood|
         ns_total = total_neighborhoods.select { |n| (n[:prdist_avg] - neighborhood[:prdist_avg]).abs < neighborhood[:prdist_std] }
         cps_total = ns_total.map { |n| n[:neighborhood_within_std].count }.reduce(:+)

data/lib/panomosity/runner.rb

@@ -18,6 +18,7 @@ module Panomosity
       generate_border_line_control_points
       get_detailed_control_point_info
       merge_image_parameters
+      nona_grid
       optimize
       prepare_for_pr0ntools
       remove_anchor_variables
@@ -408,7 +409,6 @@ module Panomosity
 
       # fix control points
       control_points.each do |control_point|
-        logger.debug "#{control_point[:n]} => #{image_map[control_point[:n].to_i]} | #{control_point[:N]} => #{image_map[control_point[:N].to_i]}"
         control_point[:n] = image_map[control_point[:n].to_i]
         control_point[:N] = image_map[control_point[:N].to_i]
       end
@@ -429,6 +429,12 @@ module Panomosity
       save_file
     end
 
+    def nona_grid
+      logger.info 'running nona and generated column and row based stitch sections'
+      images = Image.parse(@input_file)
+
+    end
+
     def optimize
       logger.info 'optimizing'
       panorama = Panorama.new(@input_file, logger)

data/lib/panomosity/utils.rb

@@ -3,7 +3,11 @@ module Panomosity
     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))
+      if values.count == 1
+        value_std = 0.0
+      else
+        value_std = Math.sqrt(values.map { |v| (v - average_value) ** 2 }.reduce(:+) / (values.count - 1))
+      end
       logger.debug "#{name} std: #{value_std}" if logger
       [average_value, value_std]
     end

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end

metadata

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