git-fit 0.18.0 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1036c14a867417be89ed1c100aa71de434f38695c49540ef56bf2b7e7d197f9
-  data.tar.gz: 66b405c18d393b552ac0e1c0000b92a66f695c6939432af2228f7a4230fd38fe
+  metadata.gz: 41afe213d0cfd11467217bc1fca559a90d791d08131f4ad2a8b1be69655cdfbe
+  data.tar.gz: bd97306411a2b55af3a0253646cbd43aff7907d4253175ea88372cea457f7e0c
 SHA512:
-  metadata.gz: d2b3c47c8b27144718d11303a7127ed6a7734e7e6015cca0c9c40ab52ec6ea08c07b1f9d5df7b9f491eeb5928f6034bc6a94e56cf5616954b0298dbbfae3e46f
-  data.tar.gz: 7f022ddad0be9ff9709310aef97f3ec4016224d719747cb0a5e6c5f7f484390dafa5257633161c187b5f8d51efaaafcc86f6e7480ff5d5f6e905db1287885932
+  metadata.gz: eee9145cb899365d6cc669dcc065e6df9d9785ce97522c3e0f561f40225193400f664158b7335395d655b4c5a4d927e835098a39a1a4cb686ff38f4deac455e0
+  data.tar.gz: 748ed231a6b7ac6fe293e6c5481da6207cf87472645214019c468ed9f95628f2943bd955980df2e4d56456af6f7dae7891c53b0d67159d9ebb799c20b6e2dbeb

data/lib/git_fit/cli/elevation.rb

@@ -57,16 +57,16 @@ module GitFit
       r = range_per_km.to_f
       s = seg_density.to_f
 
-      m = GitFit::Elevation::TerrainCoeff.terrain_M(
+      m = GitFit::Elevation::TerrainCoeff.terrain_m(
         gain_per_km: g,
         range_per_km: r,
-        seg_density: s
+        seg_density: s,
       )
       h = GitFit::Elevation::TerrainCoeff.hysteresis_threshold(m)
       spacing = GitFit::Elevation::TerrainCoeff.dem_spacing(
         gain_per_km: g,
         range_per_km: r,
-        seg_density: s
+        seg_density: s,
       )
 
       say "terrain_M: #{format('%.3f', m)}"

data/lib/git_fit/elevation/terrain_coeff.rb

@@ -36,7 +36,7 @@ module GitFit
           @model = nil
         end
 
-        def terrain_M(gain_per_km:, range_per_km:, seg_density:)
+        def terrain_m(gain_per_km:, range_per_km:, seg_density:)
           g = gain_per_km.to_f
           r = range_per_km.to_f
           s = seg_density.to_f
@@ -48,21 +48,21 @@ module GitFit
           g_n * w[0] + r_n * w[1] + s_n * w[2]
         end
 
-        def hysteresis_threshold(m)
-          return 2.0 if m <= 0
+        def hysteresis_threshold(m_val)
+          return 2.0 if m_val <= 0
           pav = model['pav_h']
-          return 2.0 if m <= pav[0][0]
-          return pav[-1][1] if m >= pav[-1][0]
-          pav.each_with_index do |(xk, yk), i|
+          return 2.0 if m_val <= pav[0][0]
+          return pav[-1][1] if m_val >= pav[-1][0]
+          pav.each_with_index do |(_xk, yk), i|
             next unless i + 1 < pav.size
-            return yk if m <= pav[i + 1][0]
+            return yk if m_val <= pav[i + 1][0]
           end
           pav[-1][1]
         end
 
         def dem_spacing(gain_per_km:, range_per_km:, seg_density:)
           nearest_neighbor_spacing(gain_per_km, range_per_km, seg_density)
-        rescue => e
+        rescue StandardError => e
           warn "TerrainCoeff: dem_spacing fallback to 181m (#{e.message})"
           181
         end
@@ -75,7 +75,7 @@ module GitFit
           elevs = {}
           uniq_vals.each_slice(100).with_index do |slice, bi|
             qs = slice.map { |la, ln| "#{la},#{ln}" }.join('|')
-            uri = URI("#{DEM_URL}?locations=#{URI.encode_www_form_component(qs)}")
+            uri = URI("#{DEM_URL}?locations=#{qs.gsub(',', '%2C').gsub('|', '%7C')}")
             begin
               res = Net::HTTP.get_response(uri)
               if res.code == '200'
@@ -112,7 +112,7 @@ module GitFit
             d = Math.sqrt(
               (gain_per_km.to_f - ref['gk'])**2 +
               (range_per_km.to_f - ref['rk'])**2 +
-              (seg_density.to_f - ref['sd'])**2
+              (seg_density.to_f - ref['sd'])**2,
             )
             next unless d < best_dist
             best_dist = d

data/lib/git_fit/elevation/train/collector.rb

@@ -25,11 +25,9 @@ module GitFit
         def each_source_sample(&block)
           adapters = @sources ? resolve_sources(@sources) : all_adapters
           adapters.each do |adapter|
-            begin
-              adapter.training_samples.each(&block)
-            rescue StandardError => e
-              warn "Collector: #{adapter.name} failed: #{e.message}"
-            end
+            adapter.training_samples.each(&block)
+          rescue StandardError => e
+            warn "Collector: #{adapter.name} failed: #{e.message}"
           end
         end
 
@@ -69,7 +67,7 @@ module GitFit
             SPACINGS.each do |sp|
               sel = sample_indices(sm, segs, distances, sp)
               lmin, lmax, npts = layered_estimate(dem, sel)
-              err = [ (lmin - truth_min).abs, (lmax - truth_max).abs ].max
+              err = [(lmin - truth_min).abs, (lmax - truth_max).abs].max
               if err <= BUDGET
                 chosen = { h: h, spacing: sp, err: err, npts: npts }
                 break
@@ -78,7 +76,7 @@ module GitFit
             unless chosen
               sel = sample_indices(sm, segs, distances, SPACINGS.last)
               lmin, lmax, npts = layered_estimate(dem, sel)
-              err = [ (lmin - truth_min).abs, (lmax - truth_max).abs ].max
+              err = [(lmin - truth_min).abs, (lmax - truth_max).abs].max
               chosen = { h: h, spacing: SPACINGS.last, err: err, npts: npts }
             end
             best = chosen if best.nil? || chosen[:npts] < best[:npts]
@@ -98,11 +96,11 @@ module GitFit
             npts: best[:npts],
             gain_per_km: f[:gain_per_km],
             range_per_km: f[:range_per_km],
-            seg_density: f[:seg_density]
+            seg_density: f[:seg_density],
           }
         end
 
-        def features(altitudes, distances, locations)
+        def features(altitudes, distances, _locations)
           return nil if altitudes.empty? || distances.empty?
 
           dm = distances.last
@@ -118,7 +116,7 @@ module GitFit
             range_per_km: range_per_km,
             seg_density: seg_density,
             distance_m: dm,
-            npts: altitudes.size
+            npts: altitudes.size,
           }
         end
 
@@ -135,8 +133,8 @@ module GitFit
           moving_avg(moving_median(vals, 9), 9)
         end
 
-        def moving_median(vals, w)
-          half = w / 2
+        def moving_median(vals, window)
+          half = window / 2
           (0...vals.size).map do |i|
             lo = [0, i - half].max
             hi = [vals.size - 1, i + half].min
@@ -144,8 +142,8 @@ module GitFit
           end
         end
 
-        def moving_avg(vals, w)
-          half = w / 2
+        def moving_avg(vals, window)
+          half = window / 2
           (0...vals.size).map do |i|
             lo = [0, i - half].max
             hi = [vals.size - 1, i + half].min
@@ -153,7 +151,7 @@ module GitFit
           end
         end
 
-        def segments(smooth, h, min_len: 20)
+        def segments(smooth, threshold, min_len: 20)
           n = smooth.size
           return [[0, n - 1]] if n < 2
 
@@ -166,28 +164,34 @@ module GitFit
             v = smooth[i]
             if rising.nil?
               if v > ext_val
-                ext_val = v; ext_idx = i; rising = true
+                ext_val = v
+                ext_idx = i
+                rising = true
               elsif v < ext_val
-                ext_val = v; ext_idx = i; rising = false
+                ext_val = v
+                ext_idx = i
+                rising = false
               end
             elsif rising
               if v > ext_val
-                ext_val = v; ext_idx = i
-              elsif ext_val - v >= h
+                ext_val = v
+                ext_idx = i
+              elsif ext_val - v >= threshold
                 segs << [seg_start, ext_idx] if ext_idx - seg_start >= min_len
                 seg_start = ext_idx if ext_idx - seg_start >= min_len
                 rising = false
-                ext_val = v; ext_idx = i
-              end
-            else
-              if v < ext_val
-                ext_val = v; ext_idx = i
-              elsif v - ext_val >= h
-                segs << [seg_start, ext_idx] if ext_idx - seg_start >= min_len
-                seg_start = ext_idx if ext_idx - seg_start >= min_len
-                rising = true
-                ext_val = v; ext_idx = i
+                ext_val = v
+                ext_idx = i
               end
+            elsif v < ext_val
+              ext_val = v
+              ext_idx = i
+            elsif v - ext_val >= threshold
+              segs << [seg_start, ext_idx] if ext_idx - seg_start >= min_len
+              seg_start = ext_idx if ext_idx - seg_start >= min_len
+              rising = true
+              ext_val = v
+              ext_idx = i
             end
           end
           segs << [seg_start, n - 1] if n - 1 - seg_start >= min_len
@@ -196,8 +200,9 @@ module GitFit
 
         def sample_indices(smooth, segs, dist, spacing)
           sel = Set.new
-          segs.each { |a, b| sel << a; sel << b }
           segs.each do |a, b|
+            sel << a
+            sel << b
             next if b - a < 2
 
             d0 = dist[a].to_f

data/lib/git_fit/elevation/train/fitter.rb

@@ -25,7 +25,7 @@ module GitFit
             norms: norms,
             pav_h: pav_h,
             lookup: lookup,
-            meta: meta
+            meta: meta,
           }
         end
 
@@ -101,7 +101,7 @@ module GitFit
         end
 
         def fit_pav_h
-          m_values = @samples.map { |s| terrain_M(s) }
+          m_values = @samples.map { |s| terrain_m(s) }
           h_values = @samples.map { |s| s[:h_opt] }
 
           sorted = @samples.map.with_index { |_, i| [m_values[i], h_values[i]] }.sort_by(&:first)
@@ -113,7 +113,7 @@ module GitFit
 
           sorted.each do |m, h|
             if current_m.nil? || (m - current_m).abs < 0.01
-              current_m = m unless current_m
+              current_m ||= m
               current_h ||= h
               current_h = [current_h, h].min
               count += 1
@@ -129,7 +129,7 @@ module GitFit
           pav
         end
 
-        def terrain_M(sample)
+        def terrain_m(sample)
           g = sample[:gain_per_km].to_f
           r = sample[:range_per_km].to_f
           s = sample[:seg_density].to_f
@@ -148,7 +148,7 @@ module GitFit
               'rk' => s[:range_per_km],
               'sd' => s[:seg_density],
               'h' => s[:h_opt],
-              'sp' => s[:spacing_opt]
+              'sp' => s[:spacing_opt],
             }
           end
         end
@@ -157,7 +157,7 @@ module GitFit
           {
             'n_samples' => @samples.size,
             'trained_at' => Time.now.strftime('%Y-%m-%d'),
-            'sources' => @samples.map { |s| s[:source] }.uniq
+            'sources' => @samples.map { |s| s[:source] }.uniq,
           }
         end
       end

data/lib/git_fit/elevation/train/runner.rb

@@ -17,33 +17,33 @@ module GitFit
         end
 
         def run
-          puts "Collecting samples..."
+          puts 'Collecting samples...'
           collector = Collector.new(sources: @sources)
           samples = collector.collect
 
           if samples.empty?
-            warn "No samples collected"
+            warn 'No samples collected'
             return false
           end
 
           puts "Collected #{samples.size} samples"
 
-          puts "Fitting model..."
+          puts 'Fitting model...'
           fitter = Fitter.new(samples)
           model = fitter.fit
 
           unless model
-            warn "Fitting failed"
+            warn 'Fitting failed'
             return false
           end
 
           puts "Writing model to #{@output}..."
           unless fitter.write_msgpack(@output)
-            warn "Failed to write model"
+            warn 'Failed to write model'
             return false
           end
 
-          puts "Model trained successfully!"
+          puts 'Model trained successfully!'
           puts "  n_samples: #{model[:meta]['n_samples']}"
           puts "  sources: #{model[:meta]['sources'].join(', ')}"
           puts "  ridge_h: #{model[:ridge_h].map { |w| format('%.2f', w) }.join(', ')}"

data/lib/git_fit/sync/base.rb

@@ -122,6 +122,61 @@ module GitFit
         def camelcase_to_snakecase(str)
           str.gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
         end
+
+        def training_samples
+          std = File.join('data', 'std', config_key)
+          return [] unless Dir.exist?(std)
+
+          Dir.children(std).filter_map do |f|
+            next unless f.end_with?('.json')
+
+            pts = JSON.parse(File.read(File.join(std, f))) rescue next
+            next unless pts.is_a?(Array) && pts.any?
+
+            altitudes = pts.filter_map { |p| p['altitude']&.to_f }
+            next if altitudes.size < 2
+
+            locations = pts.filter_map { |p| extract_location(p) }
+            next if locations.size < 2
+
+            distances = cumulative_distances(locations)
+
+            {
+              altitudes: altitudes,
+              distances: distances,
+              locations: locations,
+              source: config_key,
+              id: File.basename(f, '.json'),
+            }
+          end
+        end
+
+        def extract_location(point)
+          lat = point['positionLat'] || point['latitude'] || point['lat']
+          lng = point['positionLong'] || point['longitude'] || point['lng']
+          return nil unless lat && lng
+          [lat.to_f, lng.to_f]
+        end
+
+        def cumulative_distances(locations)
+          return [] if locations.size < 2
+
+          dists = [0.0]
+          (1...locations.size).each do |i|
+            dists << dists.last + haversine(locations[i - 1], locations[i])
+          end
+          dists
+        end
+
+        def haversine(loc1, loc2)
+          r = 6_371_000.0
+          dlat = (loc2[0] - loc1[0]) * Math::PI / 180
+          dlon = (loc2[1] - loc1[1]) * Math::PI / 180
+          la1 = loc1[0] * Math::PI / 180
+          la2 = loc2[0] * Math::PI / 180
+          h = Math.sin(dlat / 2)**2 + Math.cos(la1) * Math.cos(la2) * Math.sin(dlon / 2)**2
+          2 * r * Math.asin(Math.sqrt(h))
+        end
       end
 
       protected
@@ -208,61 +263,6 @@ module GitFit
         raise NotImplementedError, "#{self.class} must implement #raw_path"
       end
 
-      def self.training_samples
-        std = File.join('data', 'std', config_key)
-        return [] unless Dir.exist?(std)
-
-        Dir.children(std).filter_map do |f|
-          next unless f.end_with?('.json')
-
-          pts = JSON.parse(File.read(File.join(std, f))) rescue next
-          next unless pts.is_a?(Array) && pts.any?
-
-          altitudes = pts.filter_map { |p| p['altitude']&.to_f }
-          next if altitudes.size < 2
-
-          locations = pts.filter_map { |p| extract_location(p) }
-          next if locations.size < 2
-
-          distances = cumulative_distances(locations)
-
-          {
-            altitudes: altitudes,
-            distances: distances,
-            locations: locations,
-            source: config_key,
-            id: File.basename(f, '.json')
-          }
-        end
-      end
-
-      def self.extract_location(p)
-        lat = p['positionLat'] || p['latitude'] || p['lat']
-        lng = p['positionLong'] || p['longitude'] || p['lng']
-        return nil unless lat && lng
-        [lng.to_f, lat.to_f]
-      end
-
-      def self.cumulative_distances(locations)
-        return [] if locations.size < 2
-
-        dists = [0.0]
-        (1...locations.size).each do |i|
-          dists << dists.last + haversine(locations[i - 1], locations[i])
-        end
-        dists
-      end
-
-      def self.haversine(a, b)
-        r = 6_371_000.0
-        dlat = (b[0] - a[0]) * Math::PI / 180
-        dlon = (b[1] - a[1]) * Math::PI / 180
-        la1 = a[0] * Math::PI / 180
-        la2 = b[0] * Math::PI / 180
-        h = Math.sin(dlat / 2)**2 + Math.cos(la1) * Math.cos(la2) * Math.sin(dlon / 2)**2
-        2 * r * Math.asin(Math.sqrt(h))
-      end
-
       def write_source_archive(data, platform_id, ext = 'json')
         dir = raw_dir
         FileUtils.mkdir_p(dir)

data/lib/git_fit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitFit
-  VERSION = '0.18.0'
+  VERSION = '0.18.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.2
 platform: ruby
 authors:
 - Lax