tarf_monte_carlo 3.39 → 3.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e7279ef5830fc815c5c7b634bceb83e463233ec0d6f329c10c3bb5745ccbbfd
-  data.tar.gz: 04af76f8b9fa855336483d31e06a34793d522e39587d893cec07bbd0d24a0ed1
+  metadata.gz: 3983fc474126c8a34f0fce99d3f127b0057f5bf92e35949278a7018bc4c6eba0
+  data.tar.gz: 3071b3646c65f592b9b2dfa75a8cfee0dac798b20a4b6d9d21db8758068c2191
 SHA512:
-  metadata.gz: 000c137cc26ca306b2055bc10a12a5871d1b06dc5b1c0de52c93a4e8d1349c7e0f20121eb3e526bf12e23c51a8c2f20b318f981eb89d11e63d7c6cdf36692e91
-  data.tar.gz: a78e88a10174d913f1de0dacd80b5c33d08163a1a1bf8c69e8fa51534b47b4f8ab628445298495dfe835972c16328d8407b8f3cb7907c0f3d92e2e554905931f
+  metadata.gz: a457cd81fbd653af84c587af0de58495646567a9e9e0616f95226592db687e6122c109c62559867f4589bd81ae2a3bada9f79768f6ee9d1c418230868c5579bc
+  data.tar.gz: eada7cec1fa54069644d41817988789080d127fe003918e5a7fd9d40f24b9001bece1c9090dd0defd006a168716158c731f9e47fc00b2cedc31f92c26cf68522

data/ext/tarf_monte_carlo/tarf_monte_carlo.c

@@ -196,7 +196,7 @@ 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++ ) {
+    for( metric = 0; metric < 4; metric++ ) {
       metrics[metric] = ( double* ) malloc( DATAPOINTS * sizeof(double) );
       for(leg = 0; leg < DATAPOINTS; leg++) {
         metrics[metric][leg] = 0.0;
@@ -417,11 +417,16 @@ VALUE method_run_monte_carlo( VALUE self, VALUE args ) {
       else{
         sim_dash_pos[NL-1] = get_equivalent_rebate(rebate_conversion_sign, ( *( Rebate_array + 0 ) ), sim_dash[NL-1], dir_sign);
       }
-      if ((sim_count % INTERVAL) == 0){
-        metrics[0][sim_count] = sim[NL-1];
-        metrics[1][sim_count] = (knockedLeg >= 0) ? ( *( Xs_array + (knockedLeg) ) ) : 0;
-        metrics[0][sim_count+1] = sim_dash[NL-1];
-        metrics[1][sim_count+1] = (knockedLeg_dash >= 0) ? ( *( Xs_array + (knockedLeg_dash) ) ) : 0;
+      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+1] = sim_dash[NL-1];
+        metrics[1][point_pos+1] = (knockedLeg_dash >= 0) ? ( *( Xs_array + (knockedLeg_dash) ) ) : 0;
+
+        metrics[2][point_pos]   = sim_pos[NL-1];
+        metrics[2][point_pos+1] = sim_dash_pos[NL-1];
+        metrics[3][point_pos] = knockedLeg;
+        metrics[3][point_pos+1] = knockedLeg_dash;
       }
     } else if(KType == FX_AMERICAN_BARRIER_KNOCKOUT_DISCRETE){
       if(knockedLeg >= 0){
@@ -439,11 +444,11 @@ VALUE method_run_monte_carlo( VALUE self, VALUE args ) {
         sim_dash_pos[NL-1] = european_payoff(( *( Xs_array + 0 ) ), sim_dash[NL-1], cp_sign, dir_sign, equivalent_notional);
       }
 
-      if ((sim_count % INTERVAL) == 0){
-        metrics[0][sim_count] = (knockedLeg >= 0) ? sim[knockedLeg] : sim[NL-1];
-        metrics[1][sim_count] = ( *( Xs_array + 0 ) );
-        metrics[0][sim_count+1] = (knockedLeg_dash >= 0) ? sim[knockedLeg_dash] : sim[NL-1];
-        metrics[1][sim_count+1] = ( *( Xs_array + 0 ) );
+      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+1] = (knockedLeg_dash >= 0) ? sim[knockedLeg_dash] : sim[NL-1];
+        metrics[1][point_pos+1] = ( *( Xs_array + 0 ) );
       }
 
     } else if( KType == ABSOLUTE || KType == PIVOT_ABSOLUTE || KType == COLLAR_ABSOLUTE || KType == DOUBLE_STRIKE_ABSOLUTE ) {
@@ -572,19 +577,25 @@ 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 ((sim_count % INTERVAL) == 0){
-      metrics[2][sim_count]   = sim_pos_sum;
-      metrics[2][sim_count+1] = sim_dash_pos_sum;
-    }
 
-    //
-    // 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));
-      point_pos += 4;
+    
+    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));
+        point_pos += 4;
+      }
     }
   }
   // run simulations loop
@@ -618,9 +629,9 @@ VALUE method_run_monte_carlo( VALUE self, VALUE args ) {
   //
   // rb_p(rb_str_new2("Converting metrics"));
   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 < 4; metric++) {
       VALUE leg_metrics = rb_ary_new();
 
       for(leg = 0; leg < DATAPOINTS; leg++) {
@@ -652,7 +663,8 @@ VALUE method_run_monte_carlo( VALUE self, VALUE args ) {
   //
   // free your arrays from memory once you're done using them
   //
-  for(metric = 0; metric < DATAPOINTS; metric++) {
+  int dp = (KType == FX_AMERICAN_BARRIER_KNOCKIN_DISCRETE || KType == FX_AMERICAN_BARRIER_KNOCKOUT_DISCRETE) ? 4 : DATAPOINTS; 
+  for(metric = 0; metric < dp; metric++) {
     free( metrics[metric] );
   }
   free(metrics);

data/lib/tarf_monte_carlo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tarf_monte_carlo
 version: !ruby/object:Gem::Version
-  version: '3.39'
+  version: '3.44'
 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.