|
From: <boc...@su...> - 2006-02-16 20:44:25
|
Update of /cvsroot/dev-boconnor/project_logic_analysis/lib/perl/Nelson/Pipe/Container/Job In directory sumo.genetics.ucla.edu:/tmp/cvs-serv14105/lib/perl/Nelson/Pipe/Container/Job Modified Files: CreateProfiles.pm RandomlySelectFiles.pm Log Message: Changed the create profile script Index: RandomlySelectFiles.pm =================================================================== RCS file: /cvsroot/dev-boconnor/project_logic_analysis/lib/perl/Nelson/Pipe/Container/Job/RandomlySelectFiles.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RandomlySelectFiles.pm 16 Feb 2006 07:37:02 -0000 1.8 --- RandomlySelectFiles.pm 16 Feb 2006 20:44:14 -0000 1.9 *************** *** 68,73 **** } elsif ($random_selection_technique eq 'across_all_samples') { ! ! open TESTSET, ">$rand_file_list_dir/test_set_$percent_to_rand_select.txt" or die; my @files = shuffle keys(%{$stash->{$sif_file_hash}{'files'}}); my $size = int(0.01 * $percent_to_hold_for_testset * scalar(@files)); --- 68,73 ---- } elsif ($random_selection_technique eq 'across_all_samples') { ! system ("mkdir -p $rand_file_list_dir"); ! open TESTSET, ">$rand_file_list_dir/test_set_$percent_to_rand_select.txt" or die "Can't open $rand_file_list_dir/test_set_$percent_to_rand_select.txt\n"; my @files = shuffle keys(%{$stash->{$sif_file_hash}{'files'}}); my $size = int(0.01 * $percent_to_hold_for_testset * scalar(@files)); Index: CreateProfiles.pm =================================================================== RCS file: /cvsroot/dev-boconnor/project_logic_analysis/lib/perl/Nelson/Pipe/Container/Job/CreateProfiles.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CreateProfiles.pm 16 Feb 2006 08:20:06 -0000 1.13 --- CreateProfiles.pm 16 Feb 2006 20:44:14 -0000 1.14 *************** *** 39,43 **** $self->{mas5_cache} = {}; if ($pre_cache_mas5 eq '1') { ! $self->{mas5_cache} = $self->_pre_cache_mas5($mas5_dir); } --- 39,44 ---- $self->{mas5_cache} = {}; if ($pre_cache_mas5 eq '1') { ! if (-f $mas5_cache_output) { $self->{mas5_cache} = retrieve($mas5_cache_output); } ! else { $self->{mas5_cache} = $self->_pre_cache_mas5($mas5_dir); } } |