gps_pvt 0.1.1 → 0.1.2

data/ext/gps_pvt/extconf.rb

@@ -1,70 +1,70 @@
-ninja_tool_dir = File::absolute_path(File::join(
-    File::dirname(__FILE__), '..', 'ninja-scan-light', 'tool'))
-
-require "mkmf"
-cflags = " -Wall -I#{ninja_tool_dir}"
-$CFLAGS += cflags
-$CPPFLAGS += cflags if RUBY_VERSION >= "2.0.0"
-$LOCAL_LIBS += " -lstdc++ "
-
-IO_TARGETS = [
-  [Kernel, :instance_eval],
-  [(class << File; self; end), :class_eval], # https://github.com/ruby/ruby/commit/19beb028
-]
-def IO_TARGETS.mod(&b)
-  self.each{|class_, func| class_.send(func, &b)}
-end
-
-IO_TARGETS.mod{
-  alias_method(:open_orig, :open)
-}
-
-Dir::glob(File::join(File::dirname(__FILE__), "*/")).each{|dir|
-  mod_name = File::basename(dir)
-  
-  dst = File::join(Dir.getwd, mod_name)
-  FileUtils::mkdir_p(dst) if dir != dst
-  
-  $stderr.puts "For #{mod_name} ..."
-
-  # @see https://stackoverflow.com/a/35842162/15992898
-  $srcs = Dir::glob(File::join(dir, '*.cxx')).collect{|path|
-    File::join(mod_name, File::basename(path))
-  }
-  $objs = $srcs.collect{|path|
-    path.sub(/\.[^\.]+$/, '.o')
-  }
-
-  IO_TARGETS.mod{
-    # rename Makefile to Makefile.#{mod_name}
-    define_method(:open){|*args, &b|
-      args[0] += ".#{mod_name}" if (args[0] && (args[0] == "Makefile"))
-      open_orig(*args, &b)
-    }
-  }
-  create_makefile("gps_pvt/#{mod_name}")
-}
-
-IO_TARGETS.mod{
-  alias_method(:open, :open_orig)
-}
-
-# manual generation of top-level Makefile
-# @see https://yorickpeterse.com/articles/hacking-extconf-rb/
-open("Makefile", 'w'){|io|
-  # @see https://stackoverflow.com/a/17845120/15992898
-  io.write(<<-__TOPLEVEL_MAKEFILE__)
-TOPTARGETS := all clean distclean realclean install site-install
-
-SUBMFS := $(wildcard Makefile.*)
-
-$(TOPTARGETS): $(SUBMFS)
-$(SUBMFS):
-#{"\t"}$(MAKE) -f $@ $(MAKECMDGOALS)
-
-.PHONY: $(TOPTARGETS) $(SUBMFS)
-  __TOPLEVEL_MAKEFILE__
-}
-
-require 'fileutils'
-FileUtils::touch("gps_pvt.so") # dummy
+ninja_tool_dir = File::absolute_path(File::join(
+    File::dirname(__FILE__), '..', 'ninja-scan-light', 'tool'))
+
+require "mkmf"
+cflags = " -Wall -I#{ninja_tool_dir}"
+$CFLAGS += cflags
+$CPPFLAGS += cflags if RUBY_VERSION >= "2.0.0"
+$LOCAL_LIBS += " -lstdc++ "
+
+IO_TARGETS = [
+  [Kernel, :instance_eval],
+  [(class << File; self; end), :class_eval], # https://github.com/ruby/ruby/commit/19beb028
+]
+def IO_TARGETS.mod(&b)
+  self.each{|class_, func| class_.send(func, &b)}
+end
+
+IO_TARGETS.mod{
+  alias_method(:open_orig, :open)
+}
+
+Dir::glob(File::join(File::dirname(__FILE__), "*/")).each{|dir|
+  mod_name = File::basename(dir)
+  
+  dst = File::join(Dir.getwd, mod_name)
+  FileUtils::mkdir_p(dst) if dir != dst
+  
+  $stderr.puts "For #{mod_name} ..."
+
+  # @see https://stackoverflow.com/a/35842162/15992898
+  $srcs = Dir::glob(File::join(dir, '*.cxx')).collect{|path|
+    File::join(mod_name, File::basename(path))
+  }
+  $objs = $srcs.collect{|path|
+    path.sub(/\.[^\.]+$/, '.o')
+  }
+
+  IO_TARGETS.mod{
+    # rename Makefile to Makefile.#{mod_name}
+    define_method(:open){|*args, &b|
+      args[0] += ".#{mod_name}" if (args[0] && (args[0] == "Makefile"))
+      open_orig(*args, &b)
+    }
+  }
+  create_makefile("gps_pvt/#{mod_name}")
+}
+
+IO_TARGETS.mod{
+  alias_method(:open, :open_orig)
+}
+
+# manual generation of top-level Makefile
+# @see https://yorickpeterse.com/articles/hacking-extconf-rb/
+open("Makefile", 'w'){|io|
+  # @see https://stackoverflow.com/a/17845120/15992898
+  io.write(<<-__TOPLEVEL_MAKEFILE__)
+TOPTARGETS := all clean distclean realclean install site-install
+
+SUBMFS := $(wildcard Makefile.*)
+
+$(TOPTARGETS): $(SUBMFS)
+$(SUBMFS):
+#{"\t"}$(MAKE) -f $@ $(MAKECMDGOALS)
+
+.PHONY: $(TOPTARGETS) $(SUBMFS)
+  __TOPLEVEL_MAKEFILE__
+}
+
+require 'fileutils'
+FileUtils::touch("gps_pvt.so") # dummy

data/ext/ninja-scan-light/tool/swig/GPS.i

@@ -22,6 +22,17 @@
 #include "navigation/GPS_Solver_Base.h"
 #include "navigation/GPS_Solver.h"
 #include "navigation/GPS_Solver_RAIM.h"
+
+#if defined(__cplusplus) && (__cplusplus < 201103L)
+#include <sstream>
+namespace std {
+template <class T>
+inline std::string to_string(const T &value){
+  // @see https://stackoverflow.com/a/5590404/15992898
+  return static_cast<std::ostringstream &>(std::ostringstream() << value).str();
+}
+}
+#endif
 %}
 
 %include typemaps.i
@@ -246,12 +257,12 @@ struct GPS_Ionospheric_UTC_Parameters : public GPS_SpaceNode<FloatT>::Ionospheri
   MAKE_ACCESSOR(delta_t_LSF, int);
   static GPS_Ionospheric_UTC_Parameters<FloatT> parse(const unsigned int *buf){
     typedef typename GPS_SpaceNode<FloatT>
-        ::template BroadcastedMessage<unsigned int, 30> parser_t;
+        ::BroadcastedMessage<unsigned int, 30> parser_t;
     if((parser_t::subframe_id(buf) != 4) || (parser_t::sv_page_id(buf) != 56)){
       throw std::runtime_error("Not valid data");
     }
     typename GPS_SpaceNode<FloatT>::Ionospheric_UTC_Parameters::raw_t raw;
-    raw.template update<2, 0>(buf);
+    raw.update<2, 0>(buf);
     GPS_Ionospheric_UTC_Parameters<FloatT> res;
     (typename GPS_SpaceNode<FloatT>::Ionospheric_UTC_Parameters &)res = raw;
     return res;
@@ -330,12 +341,12 @@ struct GPS_Ephemeris : public GPS_SpaceNode<FloatT>::SatelliteProperties::Epheme
     typename eph_t::raw_t raw;
     eph_t eph;
     *subframe_no = GPS_SpaceNode<FloatT>
-        ::template BroadcastedMessage<unsigned int, 30>
+        ::BroadcastedMessage<unsigned int, 30>
         ::subframe_id(buf);
     *iodc_or_iode = -1; 
     switch(*subframe_no){
       case 1: 
-        *iodc_or_iode = raw.template update_subframe1<2, 0>(buf);
+        *iodc_or_iode = raw.update_subframe1<2, 0>(buf);
         eph = raw;
         self->WN = eph.WN;
         self->URA = eph.URA;
@@ -348,7 +359,7 @@ struct GPS_Ephemeris : public GPS_SpaceNode<FloatT>::SatelliteProperties::Epheme
         self->a_f0 = eph.a_f0;
         break;
       case 2: 
-        *iodc_or_iode = raw.template update_subframe2<2, 0>(buf);
+        *iodc_or_iode = raw.update_subframe2<2, 0>(buf);
         eph = raw;
         self->iode = eph.iode;
         self->c_rs = eph.c_rs;
@@ -362,7 +373,7 @@ struct GPS_Ephemeris : public GPS_SpaceNode<FloatT>::SatelliteProperties::Epheme
         self->fit_interval = eph_t::raw_t::fit_interval(raw.fit_interval_flag, self->iodc);
         break;
       case 3: 
-        *iodc_or_iode = self->iode_subframe3 = raw.template update_subframe3<2, 0>(buf);
+        *iodc_or_iode = self->iode_subframe3 = raw.update_subframe3<2, 0>(buf);
         eph = raw;
         self->c_ic = eph.c_ic;
         self->Omega0 = eph.Omega0;
@@ -787,10 +798,10 @@ struct GPS_SolverOptions : public GPS_SinglePositioning<FloatT>::options_t {
   }
   std::vector<int> set_ionospheric_models(const std::vector<int> &models){
     typedef typename base_t::ionospheric_model_t model_t;
-    for(int i(0), j(0), j_max(models.size()); i < model_t::IONOSPHERIC_MODELS; ++i){
-      model_t v(model_t::IONOSPHERIC_SKIP);
+    for(int i(0), j(0), j_max(models.size()); i < base_t::IONOSPHERIC_MODELS; ++i){
+      model_t v(base_t::IONOSPHERIC_SKIP);
       if(j < j_max){
-        if((models[j] >= 0) && (models[j] < model_t::IONOSPHERIC_SKIP)){
+        if((models[j] >= 0) && (models[j] < base_t::IONOSPHERIC_SKIP)){
           v = (model_t)models[j];
         }
         ++j;

data/gps_pvt.gemspec

@@ -1,57 +1,57 @@
-# frozen_string_literal: true
-
-require_relative "lib/gps_pvt/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "gps_pvt"
-  spec.version = GPS_PVT::VERSION
-  spec.authors = ["fenrir(M.Naruoka)"]
-  spec.email = ["fenrir.naru@gmail.com"]
-
-  spec.summary = "GPS position, velocity, and time (PVT) solver"
-  spec.description = "This module calculate PVT by using raw observation obtained from a GPS receiver"
-  spec.homepage = "https://github.com/fenrir-naru/gps_pvt"
-  spec.required_ruby_version = ">= 2.6.0"
-
-  #spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  #spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
-    
-  spec.extensions = ["ext/gps_pvt/extconf.rb"]
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  
-  spec.files += proc{
-    base_dir = File::absolute_path(File.dirname(__FILE__))
-    require 'pathname'
-    # get an array of submodule dirs by executing 'pwd' inside each submodule
-    `git submodule --quiet foreach pwd`.split($/).collect{|dir|
-      # issue git ls-files in submodule's directory
-      `git -C #{dir} ls-files -v`.split($/).collect{|f|
-        next nil unless f =~ /^H */ # consider git sparse checkout
-        # get relative path
-        f = Pathname::new(File::join(dir, $'))
-        (f.relative? ? f : f.relative_path_from(base_dir)).to_s
-      }.compact
-    }.flatten
-  }.call
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rake-compiler"
-
-  # For more information and examples about making a new gem, checkout our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end
+# frozen_string_literal: true
+
+require_relative "lib/gps_pvt/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "gps_pvt"
+  spec.version = GPS_PVT::VERSION
+  spec.authors = ["fenrir(M.Naruoka)"]
+  spec.email = ["fenrir.naru@gmail.com"]
+
+  spec.summary = "GPS position, velocity, and time (PVT) solver"
+  spec.description = "This module calculate PVT by using raw observation obtained from a GPS receiver"
+  spec.homepage = "https://github.com/fenrir-naru/gps_pvt"
+  spec.required_ruby_version = ">= 2.3.0"
+
+  #spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+  #spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+    
+  spec.extensions = ["ext/gps_pvt/extconf.rb"]
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  
+  spec.files += proc{
+    require 'pathname'
+    base_dir = Pathname::new(File::absolute_path(File.dirname(__FILE__)))
+    # get an array of submodule dirs by executing 'pwd' inside each submodule
+    `git submodule --quiet foreach pwd`.split($/).collect{|dir|
+      # issue git ls-files in submodule's directory
+      `git -C #{dir} ls-files -v`.split($/).collect{|f|
+        next nil unless f =~ /^H */ # consider git sparse checkout
+        # get relative path
+        f = Pathname::new(File::join(dir, $'))
+        (f.relative? ? f : f.relative_path_from(base_dir)).to_s
+      }.compact
+    }.flatten
+  }.call
+
+  # Uncomment to register a new dependency of your gem
+  # spec.add_dependency "example-gem", "~> 1.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake-compiler"
+
+  # For more information and examples about making a new gem, checkout our
+  # guide at: https://bundler.io/guides/creating_gem.html
+end