From 25b843f6bbacb1937bdb960777b73acbece64115 Mon Sep 17 00:00:00 2001
From: ziejd2
Date: Wed, 24 Feb 2021 14:36:59 -0600
Subject: GENENET8 update

---
 sourcecodes/cv_predictions.php | 47 ++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

(limited to 'sourcecodes/cv_predictions.php')

diff --git a/sourcecodes/cv_predictions.php b/sourcecodes/cv_predictions.php
index 811f0c35..65915534 100644
--- a/sourcecodes/cv_predictions.php
+++ b/sourcecodes/cv_predictions.php
@@ -9,11 +9,13 @@ $keyval=valid_keyval($_GET["My_key"]);
 
 <!-- Site navigation menu -->
 <ul class="navbar2">
-  <li><p>Network ID:<br><?php print($keyval);?></p></li>
-</ul>
-<ul class="navbar">
+  <li class="noHover"><p>Network ID:<br><?php print($keyval);?></p></li>
+  <li><a href="javascript:void(0);"
+    NAME="Network" title="Network" onClick=window.open("layout.php?My_key=<?php print($keyval);?>","_self");>Return to network</a></li>
   <li><a href="javascript:void(0);"
-    NAME="Network" title="Network" onClick=window.open("layout.php?My_key=<?php print($keyval);?>","_self");>Return to network</a>
+    NAME="Clear predictions" title="Clear predictions" onClick=window.open("clear_cv_pred.php?My_key=<?php print($keyval);?>","_self");>Clear all prediction and validation files</a></li>
+</ul>
+    <ul class="navbar2">
   <li><a href="help.php">Help</a>
   <li><a href="home.php">Home</a>
 
@@ -27,63 +29,64 @@ $keyval=valid_keyval($_GET["My_key"]);
 <br>
 <p align="justify">
 <ul class="listbar">
+<li>This feature has recently been added to BNW and is still being tested. Please inform us of any issues.<br>
+  Its use is briefly described <a href="help.php#crossvalid" target="_blank">here</a>.<br><br></li>
 <?php
-  $loo_file1="./data/".$keyval."looCV_temp.txt";
-  $loo_file2="./data/".$keyval."looCV.txt";
+//  $dir="/tmp/bnw/";
+  $dir="/var/lib/genenet/bnw/";
+  $loo_file1=$dir.$keyval."looCV_temp.txt";
+  $loo_file2=$dir.$keyval."looCV.txt";
 if(file_exists($loo_file1))
   {?>
-<li>1: Leave-one-out cross-validation predictions are being calculated.
-     <a href="cv_predictions.php?My_key=<?php print($keyval);?>">Refresh and update status</a>
+<li> <a class=button3 href="cv_predictions.php?My_key=<?php print($keyval);?>">Leave-one-out cross-validation predictions are being calculated.<br> Click here to update status.</a>
 <br>
 </li>
   <?php
    } else if(file_exists($loo_file2)) {
    ?>   
-<li>1: <a href="cross_valid.php?My_key=<?php print($keyval);?>" target='_self'>Leave-one-out cross-validation results are available.</a></li>
+<li><a class=button3 href="cross_valid.php?My_key=<?php print($keyval);?>" target='_self'>Leave-one-out cross-validation results are available.</a></li>
   <?php
     } else {
   ?>
-  <li>1: <a href="cross_valid.php?My_key=<?php print($keyval);?>" target='_self'>Perform leave-one-out cross-validation</a></li>
+  <li><a class=button3 href="cross_valid.php?My_key=<?php print($keyval);?>" target='_self'>Perform leave-one-out cross-validation</a></li>
   <?php
     }
    ?>
 <?php
-  $kfold_file1="./data/".$keyval."kfoldCV_temp.txt";
-  $kfold_file2="./data/".$keyval."kfoldCV.txt";
+  $kfold_file1=$dir.$keyval."kfoldCV_temp.txt";
+  $kfold_file2=$dir.$keyval."kfold_plotly.html";
 if(file_exists($kfold_file1))
   {?>
-<li>2: k-fold cross-validation predictions are being calculated.
-     <a href="cv_predictions.php?My_key=<?php print($keyval);?>">Refresh and update status</a>
+<li> <a class=button3 href="cv_predictions.php?My_key=<?php print($keyval);?>">k-fold cross-validation predictions are being calculated.<br>Click here to update status.</a>
 <br>
 </li>
   <?php
    } else if(file_exists($kfold_file2)) {
    ?>   
-<li>2: <a href="kfold_cv.php?My_key=<?php print($keyval);?>" target='_self'>k-fold cross-validation results are available</a></li>
+<li><a class=button3 href="kfold_cv.php?My_key=<?php print($keyval);?>" target='_self'>k-fold cross-validation results are available</a></li>
   <?php
     } else {
   ?>
-  <li>2: <a href="kfold_cv.php?My_key=<?php print($keyval);?>" target='_self'>Perform k-fold cross-validation</a></li>
+  <li><a class=button3 href="kfold_cv.php?My_key=<?php print($keyval);?>" target='_self'>Perform k-fold cross-validation</a></li>
   <?php
     }
    ?>
 <?php
-  $ts_file1="./data/".$keyval."ts_upload.txt";
-  $ts_file2="./data/".$keyval."ts_output.txt";
+  $ts_file1=$dir.$keyval."ts_upload.txt";
+  $ts_file2=$dir.$keyval."ts_output.txt";
 if(file_exists($ts_file1))
   {?>
-<li>3: Test set predictions are being calculated.
-     <a href="cv_predictions.php?My_key=<?php print($keyval);?>">Refresh and update status</a>
+<li><a class=button3 href="cv_predictions.php?My_key=<?php print($keyval);?>">Test set predictions are being calculated.<br> Click here to update status.</a>
 <br>
 </li>
   <?php
    } else if(file_exists($ts_file2)) {
    ?>   
-<li>3: <a href="test_set_predictions.php?My_key=<?php print($keyval);?>" target='_self'>Test set predictions are available</a></li>
+<li><a class=button3 href="test_set_predictions.php?My_key=<?php print($keyval);?>" target='_self'>Test set predictions are available</a></li>
   <?php
     } else {
   ?>
-  <li>3: <a href="test_set_predictions.php?My_key=<?php print($keyval);?>" target='_self'>Make predictions using a test data set</a></li>
+  <li><a class=button3 href="test_set_predictions.php?My_key=<?php print($keyval);?>" target='_self'>Make predictions using a test data set</a></li>
   <?php
     }
    ?>
-- 
cgit 1.4.1