tarf_monte_carlo 3.42 → 3.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 401dcffa11be28cb765633d86b3b3351af887311364893a4b4e98bcda42f1f2b
-  data.tar.gz: 8aa5d4b647a4ead25e93d8ec6d5d77f6927d767b368915c367a1557cfcd0d578
+  metadata.gz: a69379430c97fbbf86b791e49a7564c7504a21fa73f3ea44ede3ec1d3a876bc6
+  data.tar.gz: 3fcd6ef1020d223148c3279c80694c007373f933f434ee48258a62938188c130
 SHA512:
-  metadata.gz: a955c81445337676aa5c291fed82e34fa74b37a999926158b9cd09bb5c6ae14888f483c43dcafc33b04d43f4fc3c016374f81c19ac39aa71933c6746196a0978
-  data.tar.gz: 73b9c4e40243dc65b8f711d515a1ab6196fa4c17991f12d72543cb8918b990e83844f4679e55fb28ebf3bac6857ff0e9cbdd2cf5ef55f4fdeb9dc4fa1b9135f9
+  metadata.gz: 55528c53ec418a966b6e8e405ba177038e097993ac5a532bb99c4bfbc8d32048eea25ca8893749207c0ccb6e950ff0fdff6a573e99ccd71a5d627e40b3204a87
+  data.tar.gz: fd79143e72702699469613433aeffcc7fe75fa001c69a6f759582bb72059ba8847862eea11357dc365d73acf06e34a0362d3e09518ac08a865cc0480da13e3ed

data/ext/tarf_monte_carlo/tarf_monte_carlo.c

@@ -45,6 +45,7 @@
 #define FX_AMERICAN_BARRIER_KNOCKOUT_DISCRETE 14
 
 #define DATAPOINTS 200 // data for plotting
+#define BARRIER_DP 4 // data for plotting
 #define INTERVAL 50
 #define SIM_LIMIT 196 // 196 + 4 = 200 simulations nedded
 
@@ -195,8 +196,8 @@ VALUE method_run_monte_carlo( VALUE self, VALUE args ) {
   //
   double **metrics;
   if (KType == FX_AMERICAN_BARRIER_KNOCKIN_DISCRETE || KType == FX_AMERICAN_BARRIER_KNOCKOUT_DISCRETE){
-    metrics = ( double** ) malloc( 3 * sizeof(double*) );
-    for( metric = 0; metric < 3; metric++ ) {
+    metrics = ( double** ) malloc( BARRIER_DP * sizeof(double*) );
+    for( metric = 0; metric < BARRIER_DP; metric++ ) {
       metrics[metric] = ( double* ) malloc( DATAPOINTS * sizeof(double) );
       for(leg = 0; leg < DATAPOINTS; leg++) {
         metrics[metric][leg] = 0.0;
@@ -418,10 +419,12 @@ VALUE method_run_monte_carlo( VALUE self, VALUE args ) {
         sim_dash_pos[NL-1] = get_equivalent_rebate(rebate_conversion_sign, ( *( Rebate_array + 0 ) ), sim_dash[NL-1], dir_sign);
       }
       if ((point_pos < DATAPOINTS) && (sim_count % INTERVAL) == 0){
-        metrics[0][point_pos] = sim[NL-1];
-        metrics[1][point_pos] = (knockedLeg >= 0) ? ( *( Xs_array + (knockedLeg) ) ) : 0;
+        metrics[0][point_pos]   = sim[NL-1];
+        metrics[1][point_pos]   = (knockedLeg >= 0) ? ( *( Xs_array + (knockedLeg) ) ) : 0;
+        metrics[3][point_pos]   = knockedLeg;
         metrics[0][point_pos+1] = sim_dash[NL-1];
         metrics[1][point_pos+1] = (knockedLeg_dash >= 0) ? ( *( Xs_array + (knockedLeg_dash) ) ) : 0;
+        metrics[3][point_pos+1] = knockedLeg_dash;
       }
     } else if(KType == FX_AMERICAN_BARRIER_KNOCKOUT_DISCRETE){
       if(knockedLeg >= 0){
@@ -440,10 +443,12 @@ VALUE method_run_monte_carlo( VALUE self, VALUE args ) {
       }
 
       if ((point_pos < DATAPOINTS) && (sim_count % INTERVAL) == 0){
-        metrics[0][point_pos] = (knockedLeg >= 0) ? sim[knockedLeg] : sim[NL-1];
-        metrics[1][point_pos] = ( *( Xs_array + 0 ) );
+        metrics[0][point_pos]   = (knockedLeg >= 0) ? sim[knockedLeg] : sim[NL-1];
+        metrics[1][point_pos]   = ( *( Xs_array + 0 ) );
+        metrics[3][point_pos]   = knockedLeg;
         metrics[0][point_pos+1] = (knockedLeg_dash >= 0) ? sim[knockedLeg_dash] : sim[NL-1];
         metrics[1][point_pos+1] = ( *( Xs_array + 0 ) );
+        metrics[3][point_pos+1] = knockedLeg_dash;
       }
 
     } else if( KType == ABSOLUTE || KType == PIVOT_ABSOLUTE || KType == COLLAR_ABSOLUTE || KType == DOUBLE_STRIKE_ABSOLUTE ) {
@@ -572,17 +577,20 @@ VALUE method_run_monte_carlo( VALUE self, VALUE args ) {
     pvs_pos[sim_count + 1]  = sim_dash_pos_sum;
     pvs_neg[sim_count]      = sim_neg_sum;
     pvs_neg[sim_count + 1]  = sim_dash_neg_sum;
-    if ((point_pos < DATAPOINTS) && (sim_count % INTERVAL) == 0){
-      metrics[2][point_pos]   = sim_pos_sum;
-      metrics[2][point_pos+1] = sim_dash_pos_sum;
-      point_pos += 2;
-    }
 
-    //
-    // increment metric storing point by 4
-    // Note: no limit condition here
-    //
-    if (!(KType == FX_AMERICAN_BARRIER_KNOCKIN_DISCRETE || KType == FX_AMERICAN_BARRIER_KNOCKOUT_DISCRETE)){
+    
+    if (KType == FX_AMERICAN_BARRIER_KNOCKIN_DISCRETE || KType == FX_AMERICAN_BARRIER_KNOCKOUT_DISCRETE){
+      if ((point_pos < DATAPOINTS) && (sim_count % INTERVAL) == 0){
+        metrics[2][point_pos]   = sim_pos_sum;
+        metrics[2][point_pos+1] = sim_dash_pos_sum;
+        point_pos += 2;
+      }
+    }
+    else{
+      //
+      // increment metric storing point by 4
+      // Note: no limit condition here
+      //
       if( (sim_count + 2) % INTERVAL == 0 ) {
         // rb_p(rb_str_new2("T:"));
         // rb_p(INT2NUM(point_pos));
@@ -623,7 +631,7 @@ VALUE method_run_monte_carlo( VALUE self, VALUE args ) {
   VALUE final_metrics = rb_ary_new();
   
   if (KType == FX_AMERICAN_BARRIER_KNOCKIN_DISCRETE || KType == FX_AMERICAN_BARRIER_KNOCKOUT_DISCRETE){
-    for(metric = 0; metric < 3; metric++) {
+    for(metric = 0; metric < BARRIER_DP; metric++) {
       VALUE leg_metrics = rb_ary_new();
 
       for(leg = 0; leg < DATAPOINTS; leg++) {
@@ -655,7 +663,7 @@ VALUE method_run_monte_carlo( VALUE self, VALUE args ) {
   //
   // free your arrays from memory once you're done using them
   //
-  int dp = (KType == FX_AMERICAN_BARRIER_KNOCKIN_DISCRETE || KType == FX_AMERICAN_BARRIER_KNOCKOUT_DISCRETE) ? 3 : DATAPOINTS; 
+  int dp = (KType == FX_AMERICAN_BARRIER_KNOCKIN_DISCRETE || KType == FX_AMERICAN_BARRIER_KNOCKOUT_DISCRETE) ? BARRIER_DP : DATAPOINTS; 
   for(metric = 0; metric < dp; metric++) {
     free( metrics[metric] );
   }

data/lib/tarf_monte_carlo/version.rb

@@ -3,5 +3,5 @@
 # gem yank tarf_monte_carlo -v 2.3
 
 module TarfMonteCarlo
-  VERSION = "3.42"
+  VERSION = "3.47"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tarf_monte_carlo
 version: !ruby/object:Gem::Version
-  version: '3.42'
+  version: '3.47'
 platform: ruby
 authors:
 - Vivek Routh
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Monte Carlo Simulation.