ballistics 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afee8804afd6b1d6c21c972cd12e6a56e0b9a90c
-  data.tar.gz: 13a04e599ba668fac98d97addf2f6a9d31ba2ee2
+  metadata.gz: a4ba3d0aec12eee3a0bada1d015678f2267b6e6c
+  data.tar.gz: fe2fe7e3cceeff32a6c978fa03cda97772bcced2
 SHA512:
-  metadata.gz: 76f6b65bd5991e05270c03cb7b15d89c67aa5264889fba200fc887135942c3427795849dfa89752a00cd0494fe009da06d7aa6b8e9249445a636918e08fef6fe
-  data.tar.gz: 611d4d8ea5f81dd93067b10904487bc393464b2388e6bdcfb280d734490d96c79f510b67430541a76f921d461e5d9da6c20337b2800d9445018da1822521b3b8
+  metadata.gz: 73c3a515f55a85f155741e103aa8b9ebb1afeb2fc33ae27b8cde926ee1eb651de505c0df974de3c8130a92ef31bbf3f558a4cd2b8cdc109b427805ffd065c0da
+  data.tar.gz: d01176c7f9f3770846cd694567f957404ddbe434929f4fbc7c3c09bcbcc3fb19a767fd5b63979eaa1fac7845a8912544c6871ce2cf6c93481064ef8d9f66e8ce

data/ext/ballistics/ballistics.c

@@ -75,12 +75,14 @@ VALUE method_map_trajectory(VALUE self, VALUE drag_function, VALUE drag_coeffici
 
 		if (x/3>=n){
       VALUE entry = rb_hash_new();
-      rb_hash_aset(entry, rb_str_new2("range"), rb_float_new(x/3));
+      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(crosswind,Vi,x,t+dt)));
-      rb_hash_aset(entry, rb_str_new2("moa_windage"), rb_float_new(RadtoMOA(atan(rb_hash_aref(entry, rb_str_new2("windage"))))));
+      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++;	

data/spec/ballistics/atmosphere_spec.rb

@@ -7,9 +7,4 @@ describe Ballistics::Atmosphere do
   it 'returns a corrected BC' do
     expect(atmosphere.correct_ballistic_coefficient(0.338).round(3).to_f).to eq 0.392
   end
-
-  it 'has working accessors' do
-    expect(atmosphere.temperature).to eq 40
-  end
-
 end

data/spec/ballistics/zero_spec.rb

@@ -13,7 +13,7 @@ describe Ballistics::Zero do
     }
   end
 
-  it 'returns the correct value' do
+  it 'returns the expected value' do
     expect(Ballistics::Zero.calculate_zero_angle(options).round(6)).to eq 0.227188
   end
 end

data/spec/ballistics_spec.rb

@@ -7,8 +7,10 @@ describe Ballistics do
                               drag_coefficient: 0.5,
                               velocity: 2850,
                               sight_height: 1.6,
+                              wind_speed: 10,
+                              wind_angle: 90,
                               zero_range: 200,
-                              max_range: 400,
+                              max_range: 1000,
                               environment: environment)
   end
 
@@ -16,10 +18,58 @@ describe Ballistics do
     expect(environment).to be_an_instance_of Ballistics::Atmosphere
   end
 
-  it 'returns an array of queryable ballistic objects' do
-    expect(result_array[400]['path'].round(1).to_f).to eq -20.1
+  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
+  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
+  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[400]['moa_correction'].round(1).to_f).to eq 4.8
-    expect(result_array[100]['moa_correction'].round(1).to_f).to eq -1.5
+    expect(result_array[500]['velocity'].to_i).to eq 2108
+    expect(result_array[1000]['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
   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
+  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
+  end
+
 end

metadata

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