ballistics 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4ba3d0aec12eee3a0bada1d015678f2267b6e6c
-  data.tar.gz: fe2fe7e3cceeff32a6c978fa03cda97772bcced2
+  metadata.gz: 2c933900d7778a88c08d82cd6aa1cf853f3abbbf
+  data.tar.gz: b34a53f9ef4609e36b8a59076f422ee8486b88ac
 SHA512:
-  metadata.gz: 73c3a515f55a85f155741e103aa8b9ebb1afeb2fc33ae27b8cde926ee1eb651de505c0df974de3c8130a92ef31bbf3f558a4cd2b8cdc109b427805ffd065c0da
-  data.tar.gz: d01176c7f9f3770846cd694567f957404ddbe434929f4fbc7c3c09bcbcc3fb19a767fd5b63979eaa1fac7845a8912544c6871ce2cf6c93481064ef8d9f66e8ce
+  metadata.gz: 813eda1d29613a8f63eb3735a8af8a796de92d9155b217f2f3018ef525be71ec170a88d030b7d2a421f1bd164c2ed4316b85325a315a07528e8ae9335964cda9
+  data.tar.gz: 4f1f0aa9c6829851ed7fc93063814753f1671e051f86de0cceb2410147b88411a313324d6755e587200db41c41cd27eecd999ead15546dad0443abb0fe687011

data/ext/ballistics/ballistics.c

@@ -1,7 +1,7 @@
 #include <ruby.h>
 #include <gnu_ballistics.h>
 VALUE method_calculate_zero_angle(VALUE self, VALUE drag_function, VALUE drag_coefficient, VALUE velocity, VALUE sight_height, VALUE zero_range, VALUE y_intercept);
-VALUE method_map_trajectory(VALUE self, VALUE drag_function, VALUE drag_coefficient, VALUE velocity, VALUE sight_height, VALUE shooting_angle, VALUE zero_angle, VALUE wind_speed, VALUE wind_angle, VALUE max_range);
+VALUE method_map_trajectory(VALUE self, VALUE drag_function, VALUE drag_coefficient, VALUE velocity, VALUE sight_height, VALUE shooting_angle, VALUE zero_angle, VALUE wind_speed, VALUE wind_angle, VALUE max_range, VALUE interval);
 	
 VALUE cBallistics;
 VALUE cZero;
@@ -11,7 +11,7 @@ void Init_ballistics() {
   cZero = rb_define_module_under(cBallistics, "Zero");
   cTrajectory = rb_define_module_under(cBallistics, "Trajectory");
   rb_define_singleton_method(cZero, "_calculate_zero_angle", method_calculate_zero_angle, 6);
-  rb_define_singleton_method(cTrajectory, "_map_trajectory", method_map_trajectory, 9);
+  rb_define_singleton_method(cTrajectory, "_map_trajectory", method_map_trajectory, 10);
 }
 
 VALUE method_calculate_zero_angle(VALUE self, VALUE drag_function, VALUE drag_coefficient, VALUE velocity, VALUE sight_height, VALUE zero_range, VALUE y_intercept) {
@@ -19,7 +19,7 @@ VALUE method_calculate_zero_angle(VALUE self, VALUE drag_function, VALUE drag_co
   return rb_float_new(angle);
 }
 
-VALUE method_map_trajectory(VALUE self, VALUE drag_function, VALUE drag_coefficient, VALUE velocity, VALUE sight_height, VALUE shooting_angle, VALUE zero_angle, VALUE wind_speed, VALUE wind_angle, VALUE max_range) {
+VALUE method_map_trajectory(VALUE self, VALUE drag_function, VALUE drag_coefficient, VALUE velocity, VALUE sight_height, VALUE shooting_angle, VALUE zero_angle, VALUE wind_speed, VALUE wind_angle, VALUE max_range, VALUE interval) {
 
   /* cast ruby variables */
   int    DragFunction = FIX2INT(drag_function);
@@ -31,6 +31,7 @@ VALUE method_map_trajectory(VALUE self, VALUE drag_function, VALUE drag_coeffici
   double WindSpeed = NUM2DBL(wind_speed);
   double WindAngle = NUM2DBL(wind_angle);
   int    MaxRange = FIX2INT(max_range);
+  int    Interval = FIX2INT(interval);
 
   /* create ruby objects */
   VALUE result_array = rb_ary_new2(MaxRange);
@@ -73,19 +74,22 @@ VALUE method_map_trajectory(VALUE self, VALUE drag_function, VALUE drag_coeffici
 
 
 
-		if (x/3>=n){
-      VALUE entry = rb_hash_new();
-      double windage_value = Windage(crosswind,Vi,x,t+dt);
-      double moa_windage_value = windage_value / (((x/3) / 100) * 1.0465);
-      rb_hash_aset(entry, rb_str_new2("range"), rb_float_new((int)(x/3)));
-      rb_hash_aset(entry, rb_str_new2("path"), rb_float_new(y*12));
-      rb_hash_aset(entry, rb_str_new2("moa_correction"), rb_float_new(-RadtoMOA(atan(y/x))));
-      rb_hash_aset(entry, rb_str_new2("time"), rb_float_new(t+dt));
-      rb_hash_aset(entry, rb_str_new2("windage"), rb_float_new(windage_value));
-      rb_hash_aset(entry, rb_str_new2("moa_windage"), rb_float_new(moa_windage_value));
-      rb_hash_aset(entry, rb_str_new2("velocity"), rb_float_new(v));
-      rb_ary_push(result_array, entry);
-			n++;	
+    int yards = (x/3);
+		if (yards>=n){
+      if (yards % Interval == 0){
+        VALUE entry = rb_hash_new();
+        double windage_value = Windage(crosswind,Vi,x,t+dt);
+        double moa_windage_value = windage_value / ((yards / 100.0) * 1.0465);
+        rb_hash_aset(entry, rb_str_new2("range"), rb_float_new((int)(yards)));
+        rb_hash_aset(entry, rb_str_new2("path"), rb_float_new(y*12));
+        rb_hash_aset(entry, rb_str_new2("moa_correction"), rb_float_new(-RadtoMOA(atan(y/x))));
+        rb_hash_aset(entry, rb_str_new2("time"), rb_float_new(t+dt));
+        rb_hash_aset(entry, rb_str_new2("windage"), rb_float_new(windage_value));
+        rb_hash_aset(entry, rb_str_new2("moa_windage"), rb_float_new(moa_windage_value));
+        rb_hash_aset(entry, rb_str_new2("velocity"), rb_float_new(v));
+        rb_ary_push(result_array, entry);
+      }
+      n++;	
 		}	
 		
 		// Compute position based on average velocity.

data/lib/ballistics.rb

@@ -11,7 +11,7 @@ module Ballistics
 
   def self.map_trajectory(options = {})
     [:drag_function, :drag_coefficient, :velocity, :sight_height, :zero_range].each do |requirement|
-      raise ArgumentError "Failed to specify: #{requirement}" unless options[requirement]
+      raise ArgumentError, "Failed to specify: #{requirement}" unless options[requirement]
     end
 
     # correct ballistic coefficient if an environment was passed

data/lib/ballistics/trajectory.rb

@@ -3,7 +3,7 @@ require_relative 'df_map'
 module Ballistics
   module Trajectory
     def self.map_trajectory(opts = {})
-      options = { shooting_angle: 0, wind_speed: 0, wind_angle: 0, max_range: 500 }.merge(opts)
+      options = { shooting_angle: 0, wind_speed: 0, wind_angle: 0, max_range: 500, interval: 1 }.merge(opts)
 
       drag_function = Ballistics::DFMap.__convert_df_to_int(options[:drag_function])
       drag_coefficient = options[:drag_coefficient]
@@ -14,8 +14,9 @@ module Ballistics
       wind_speed = options[:wind_speed]
       wind_angle = options[:wind_angle]
       max_range = options[:max_range]
+      interval = options[:interval]
 
-      self._map_trajectory(drag_function, drag_coefficient, vi, sight_height, shooting_angle, z_angle, wind_speed, wind_angle, max_range)
+      self._map_trajectory(drag_function, drag_coefficient, vi, sight_height, shooting_angle, z_angle, wind_speed, wind_angle, max_range, interval)
     end
   end
 end

data/spec/ballistics_spec.rb

@@ -11,65 +11,80 @@ describe Ballistics do
                               wind_angle: 90,
                               zero_range: 200,
                               max_range: 1000,
-                              environment: environment)
+                              environment: environment,
+                              interval: 25)
+  end
+
+  let(:bad_params) do
+    Ballistics.map_trajectory(drag_function: 'G1', drag_coefficient: 0.5, velocity: 2850)
   end
 
   it 'returns an environment' do
     expect(environment).to be_an_instance_of Ballistics::Atmosphere
   end
 
+  it 'raises an error with incomplete params' do
+    expect{ bad_params }.to raise_error(ArgumentError)
+  end
+
   it 'returns the range' do
-    expect(result_array[100]['range'].round(1)).to eq 100
-    expect(result_array[200]['range'].round(1)).to eq 200
-    expect(result_array[300]['range'].round(1)).to eq 300
-    expect(result_array[400]['range'].round(1)).to eq 400
-    expect(result_array[500]['range'].round(1)).to eq 500
-    expect(result_array[1000]['range'].round(1)).to eq 1000
+    expect(result_array[2]['range']).to eq 50
+    expect(result_array[4]['range']).to eq 100
+    expect(result_array[8]['range']).to eq 200
+    expect(result_array[12]['range']).to eq 300
+    expect(result_array[16]['range']).to eq 400
+    expect(result_array[20]['range']).to eq 500
+    expect(result_array[40]['range']).to eq 1000
   end
 
   it 'returns the path' do
-    expect(result_array[100]['path'].round(1)).to eq 1.6
-    expect(result_array[200]['path'].round(1)).to eq 0
-    expect(result_array[300]['path'].round(1)).to eq -7
-    expect(result_array[400]['path'].round(1)).to eq -20.1
-    expect(result_array[500]['path'].round(1)).to eq -40.1
-    expect(result_array[1000]['path'].round(1)).to eq -282.5
+    expect(result_array[2]['path'].round(1)).to eq 0.6
+    expect(result_array[4]['path'].round(1)).to eq 1.6
+    expect(result_array[8]['path'].round(1)).to eq 0
+    expect(result_array[12]['path'].round(1)).to eq -7
+    expect(result_array[16]['path'].round(1)).to eq -20.1
+    expect(result_array[20]['path'].round(1)).to eq -40.1
+    expect(result_array[40]['path'].round(1)).to eq -282.5
   end
 
   it 'returns the velocity' do
-    expect(result_array[100]['velocity'].to_i).to eq 2691
-    expect(result_array[200]['velocity'].to_i).to eq 2538
-    expect(result_array[300]['velocity'].to_i).to eq 2390
-    expect(result_array[400]['velocity'].to_i).to eq 2246
-    expect(result_array[500]['velocity'].to_i).to eq 2108
-    expect(result_array[1000]['velocity'].to_i).to eq 1500
+    expect(result_array[2]['velocity'].to_i).to eq 2769
+    expect(result_array[4]['velocity'].to_i).to eq 2691
+    expect(result_array[8]['velocity'].to_i).to eq 2538
+    expect(result_array[12]['velocity'].to_i).to eq 2390
+    expect(result_array[16]['velocity'].to_i).to eq 2246
+    expect(result_array[20]['velocity'].to_i).to eq 2108
+    expect(result_array[40]['velocity'].to_i).to eq 1500
   end
 
   it 'returns the moa correction' do
-    expect(result_array[100]['moa_correction'].round(1)).to eq -1.5
-    expect(result_array[200]['moa_correction'].round(1)).to eq 0
-    expect(result_array[300]['moa_correction'].round(1)).to eq 2.2
-    expect(result_array[400]['moa_correction'].round(1)).to eq 4.8
-    expect(result_array[500]['moa_correction'].round(1)).to eq 7.7
-    expect(result_array[1000]['moa_correction'].round(1)).to eq 27
+    expect(result_array[2]['moa_correction'].round(1)).to eq -1.1
+    expect(result_array[4]['moa_correction'].round(1)).to eq -1.5
+    expect(result_array[8]['moa_correction'].round(1)).to eq 0
+    expect(result_array[12]['moa_correction'].round(1)).to eq 2.2
+    expect(result_array[16]['moa_correction'].round(1)).to eq 4.8
+    expect(result_array[20]['moa_correction'].round(1)).to eq 7.7
+    expect(result_array[40]['moa_correction'].round(1)).to eq 27
   end
 
   it 'returns the windage' do
-    expect(result_array[100]['windage'].round(1)).to eq 0.6
-    expect(result_array[200]['windage'].round(1)).to eq 2.3
-    expect(result_array[300]['windage'].round(1)).to eq 5.2
-    expect(result_array[400]['windage'].round(1)).to eq 9.4
-    expect(result_array[500]['windage'].round(1)).to eq 15.2
-    expect(result_array[1000]['windage'].round(1)).to eq 71.3
+    expect(result_array[2]['windage'].round(1)).to eq 0.2
+    expect(result_array[4]['windage'].round(1)).to eq 0.6
+    expect(result_array[8]['windage'].round(1)).to eq 2.3
+    expect(result_array[12]['windage'].round(1)).to eq 5.2
+    expect(result_array[16]['windage'].round(1)).to eq 9.4
+    expect(result_array[20]['windage'].round(1)).to eq 15.2
+    expect(result_array[40]['windage'].round(1)).to eq 71.3
   end
 
   it 'returns the moa correction for wind drift windage' do
-    expect(result_array[100]['moa_windage'].round(1)).to eq 0.5
-    expect(result_array[200]['moa_windage'].round(1)).to eq 1.1
-    expect(result_array[300]['moa_windage'].round(1)).to eq 1.6
-    expect(result_array[400]['moa_windage'].round(1)).to eq 2.3
-    expect(result_array[500]['moa_windage'].round(1)).to eq 2.9
-    expect(result_array[1000]['moa_windage'].round(1)).to eq 6.8
+    expect(result_array[2]['moa_windage'].round(1)).to eq 0.3
+    expect(result_array[4]['moa_windage'].round(1)).to eq 0.5
+    expect(result_array[8]['moa_windage'].round(1)).to eq 1.1
+    expect(result_array[12]['moa_windage'].round(1)).to eq 1.6
+    expect(result_array[16]['moa_windage'].round(1)).to eq 2.3
+    expect(result_array[20]['moa_windage'].round(1)).to eq 2.9
+    expect(result_array[40]['moa_windage'].round(1)).to eq 6.8
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ballistics
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Travis Staton