panomosity 0.1.29 → 0.1.30
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/panomosity/neighborhood_group.rb +5 -2
- data/lib/panomosity/optimizer.rb +12 -5
- data/lib/panomosity/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 75a840caab3ec6ccf1d6ac9a815037041c2b9b8fa5fb241185f8e5f7fac47371
|
4
|
+
data.tar.gz: 1abc680b6613331381b61047072df57f30242f188bea2e0ba4be1eb433065966
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3828862db188158ee5e1101cdff98649c2e90ef9d314f6e370a2ca0d6743b7da88cf9c87571205d554142dae69dd29bfa32eb25ebf68ade0333443673b49d282
|
7
|
+
data.tar.gz: c076ec3e926bfe49972868766660bfe9d72d5fdcc81441943da4a8d5f29eaffc8f57909d142049b523ad1dc054b128aa6dc0a334e877291adc8df369db684afb
|
data/Gemfile.lock
CHANGED
@@ -82,6 +82,9 @@ module Panomosity
|
|
82
82
|
|
83
83
|
neighborhood_groups.max_by(5) { |ng| ng.control_points.count }.each do |ng|
|
84
84
|
logger.debug "#{ng.prdist_avg} #{ng.prdist_std} #{ng.control_points.count} x#{ng.x_avg} y#{ng.y_avg}"
|
85
|
+
logger.debug "#{calculate_average(values: ng.control_points.map(&:pdist))} x#{calculate_average(values: ng.control_points.map(&:px))} y#{calculate_average(values: ng.control_points.map(&:py))}"
|
86
|
+
|
87
|
+
ng.control_points.each { |point| logger.debug point.detailed_info }
|
85
88
|
end
|
86
89
|
|
87
90
|
self.neighborhood_groups = neighborhood_groups.sort_by { |ng| -ng.control_points.count }
|
@@ -99,8 +102,8 @@ module Panomosity
|
|
99
102
|
def calculate
|
100
103
|
@neighborhoods = total_neighborhoods.select { |n| (n.prdist_avg - center.prdist_avg).abs <= center.prdist_std }
|
101
104
|
@control_points = neighborhoods.map(&:control_points_within_std).flatten.uniq(&:raw)
|
102
|
-
@x_avg = calculate_average(values: control_points.map(&:
|
103
|
-
@y_avg = calculate_average(values: control_points.map(&:
|
105
|
+
@x_avg = calculate_average(values: control_points.map(&:px))
|
106
|
+
@y_avg = calculate_average(values: control_points.map(&:py))
|
104
107
|
@prdist_avg = center.prdist_avg
|
105
108
|
@prdist_std = center.prdist_std
|
106
109
|
self
|
data/lib/panomosity/optimizer.rb
CHANGED
@@ -93,25 +93,32 @@ module Panomosity
|
|
93
93
|
# we grab the top 5 neighborhood groups and get the average distance for them and average that
|
94
94
|
dist_avg = calculate_average_distance
|
95
95
|
|
96
|
-
r -= 0.
|
96
|
+
r -= 0.01
|
97
97
|
logger.debug "current roll #{r}"
|
98
98
|
new_dist_avg = recalculate_average_distance(roll: r)
|
99
99
|
logger.debug "avg: #{dist_avg} new_avg: #{new_dist_avg}"
|
100
100
|
|
101
|
+
operation_map = { :- => 'subtracting', :+ => 'adding' }
|
101
102
|
if new_dist_avg < dist_avg
|
102
|
-
logger.debug 'found that subtracting roll will decrease distances, resetting roll...'
|
103
103
|
operation = :-
|
104
|
+
logger.debug "found that #{operation_map[operation]} roll will decrease distances, resetting roll..."
|
104
105
|
else
|
105
|
-
logger.debug 'found that adding roll will decrease distances, resetting roll...'
|
106
106
|
operation = :+
|
107
|
+
logger.debug "found that #{operation_map[operation]} roll will decrease distances, resetting roll..."
|
107
108
|
r = original_roll
|
108
|
-
r += 0.
|
109
|
+
r += 0.01
|
109
110
|
logger.debug "current roll #{r}"
|
110
111
|
new_dist_avg = recalculate_average_distance(roll: r)
|
111
112
|
end
|
112
113
|
|
114
|
+
logger.debug "avg: #{dist_avg} new_avg: #{new_dist_avg}"
|
115
|
+
if new_dist_avg > dist_avg
|
116
|
+
logger.debug "found that #{operation_map[operation]} roll will also increase distances, leaving roll unchanged "
|
117
|
+
r = original_roll
|
118
|
+
end
|
119
|
+
|
113
120
|
while new_dist_avg <= dist_avg
|
114
|
-
r = r.send(operation, 0.
|
121
|
+
r = r.send(operation, 0.01)
|
115
122
|
logger.debug "current roll #{r}"
|
116
123
|
dist_avg = new_dist_avg
|
117
124
|
new_dist_avg = recalculate_average_distance(roll: r)
|
data/lib/panomosity/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: panomosity
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.30
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Oliver Garcia
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-12-
|
11
|
+
date: 2018-12-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|