From 4d8e932c47b896fb4dcea328df7743e2593e9746 Mon Sep 17 00:00:00 2001
From: pontus_pih <pontus_pih>
Date: Thu, 12 Jan 2006 16:50:24 +0000
Subject: [PATCH] *** empty log message ***

---
 lib/tool/bootstrap_subs.pm | 23 ++++++++++++++---------
 lib/tool/scm_subs.pm       |  3 ++-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/tool/bootstrap_subs.pm b/lib/tool/bootstrap_subs.pm
index fb41ac7..3dd9c52 100644
--- a/lib/tool/bootstrap_subs.pm
+++ b/lib/tool/bootstrap_subs.pm
@@ -774,7 +774,8 @@ start modelfit_analyze
 		   shrinkage        => $self -> {'shrinkage'},
 		   nonparametric_marginals => $self -> {'nonparametric_marginals'},
 		   nonparametric_etas => $self -> {'nonparametric_etas'},
-		   adaptive         => $self -> {'adaptive'} );
+		   adaptive         => $self -> {'adaptive'},
+		   rerun            => $self -> {'rerun'});
 	    random_set_seed( @seed );
 	    ui -> print( category => 'bootstrap',
 			 message  => "Restarting BCa Jackknife from ".
@@ -790,15 +791,16 @@ start modelfit_analyze
 	  $self -> {'jackknife_prepared_models'} = $self -> {'jackknife'} -> {'prepared_models'};
 
 	  $self -> {'jackknife_raw_results'}[$model_number-1] =
-	    $self -> {'jackknife'} -> raw_results;
-
+	    $self -> {'jackknife'} -> raw_results -> [$model_number-1];
+	  $Data::Dumper::Maxdepth = 0;
+	  print Dumper $self -> {'jackknife_raw_results'};
 	  # }}} BCa
 
 	} else {
 	  @calculation_order = @{$self -> {'calculation_order'}};
 	  @print_order = @{$self -> {'print_order'}};
 	  $self -> {'bootstrap_raw_results'}[$model_number-1] =
-	    $self -> {'tools'} -> [0] -> raw_results;
+	    $self -> {'tools'} -> [0] -> raw_results -> [$model_number-1];
 	}
 	unless( ref($self -> {'raw_results_header'}[0]) eq 'ARRAY' ) {
 	  my $tmp = $self -> {'raw_results_header'};
@@ -991,7 +993,7 @@ start prepare_results
                                                      # the method column added
                                                      # with a bca run.
 
-	  my @param_names = @{$self -> {'raw_results_header'}[$i]}[($mps_offset + scalar @{$self -> {'diagnostic_parameters'}}) .. (scalar @{$self -> {'raw_results_header'}[$i]} - 1)];
+	  my @param_names = @{$self -> {'raw_results_header'}}[($mps_offset + scalar @{$self -> {'diagnostic_parameters'}}) .. (scalar @{$self -> {'raw_results_header'}} - 1)];
 #	  my @param_names = @{$self -> models -> [$i] -> outputs -> [0] -> labels};
 #	  @param_names = @{$param_names[0]};
 	  my ( @diagnostic_names, @tmp_names );
@@ -1250,17 +1252,18 @@ start bca_read_raw_results
 	    map { chomp; my @tmp = split(',',$_); $_ = \@tmp } @file ;
 
 	    my $header = shift @file;
+
 	    # Get rid of 'method' column
 	    my $cols = scalar(@{$header})-1;
 	    $self -> {'raw_results_header'} -> [$i-1] = $header->[1..$cols];
 	    $self -> {'raw_results'} -> [$i-1] = \@file;
 	    for( my $j = 0; $j <= $#file; $j++ ) {
 	      if ( $file[$j][0] eq 'jackknife' ) {
-		push( @{$self -> {'jackknife_raw_results'}[$i-1]},
-		      [@{$file[$j]}[1..$cols]] );
+		shift( @{$file[$j]} );
+		$self -> {'jackknife_raw_results'}[$i-1] = \@file;
 	      } else {
-		push( @{$self -> {'bootstrap_raw_results'}[$i-1]},
-		      [@{$file[$j]}[1..$cols]] );
+		shift( @{$file[$j]} );
+		$self -> {'bootstrap_raw_results'}[$i-1] = \@file;
 	      }
 	    }
 	  }
@@ -1661,6 +1664,7 @@ end calculate_bca_confidence_intervals
 # }}} calculate_bca_confidence_intervals
 
 # {{{ calculate_percentile_confidence_intervals
+
 start calculate_percentile_confidence_intervals
       {
 	# Sort the limits from the inside out
@@ -1720,6 +1724,7 @@ start calculate_percentile_confidence_intervals
 	  [$model_number-1][1] = \@parameter_names;
       }
 end calculate_percentile_confidence_intervals
+
 # }}} calculate_percentile_confidence_intervals
 
 # {{{ modelfit_post_fork_analyze
diff --git a/lib/tool/scm_subs.pm b/lib/tool/scm_subs.pm
index 19bde03..42b8c61 100644
--- a/lib/tool/scm_subs.pm
+++ b/lib/tool/scm_subs.pm
@@ -1451,7 +1451,7 @@ start modelfit_analyze
 	      $self -> base_criteria_values( $return -> {'values'} );
 	    }
 	  }
-
+	  print Dumper $self -> {'included_relations'};
 	} else {
 	  my @tmp_ret;
 	  $tmp_ret[0]{'own'}[0]{'name'}   = 'final.model';
@@ -1512,6 +1512,7 @@ start modelfit_analyze
 
 	# Leave base_criteria_values as they are
       }
+
       my %return_section;
        $return_section{'name'} = 'base.criteria.values';
        $return_section{'values'} = $self -> base_criteria_values;
-- 
2.11.4.GIT