Merge pull request #1 from ziejd2/octave_php_separate

Octave php separate

1 files changed, 15 insertions, 11 deletions

diff --git a/sourcecodes/add_inv.php b/sourcecodes/add_inv.php
index 77e0f0ef..d9ec7cbb 100644
--- a/sourcecodes/add_inv.php
+++ b/sourcecodes/add_inv.php
@@ -100,10 +100,14 @@ for($j=0;$j<$nn;$j++)
 
 $dt=$type_d[$s];
  
-if($dt==1)
-   $textdata=reversemap($sym,$textdata,$keyval);
-else
-   $textdata=discretemap($textdata,$sym,$dmapdata);
+//if($dt==1)
+//   $textdata=reversemap($sym,$textdata,$keyval);
+//else
+//   $textdata=discretemap($textdata,$sym,$dmapdata);
+
+if($dt!=1)
+  $textdata=discretemap($textdata,$sym,$dmapdata);
+
 
  $ft=$dir.$keyval."var.txt"; 
  $f1=fopen("$ft","w");  
@@ -188,17 +192,17 @@ structure_change($keyval);
 
 
 
-  $file1="./data/".$keyval."run_newintervention.sh";
-  $initiallines=file_get_contents("./data/temp_intervention_file");
-  $all_lines="$initiallines"."$keyval\nfi\nexit";
+//  $file1="./data/".$keyval."run_newintervention.sh";
+//  $initiallines=file_get_contents("./data/temp_intervention_file");
+//  $all_lines="$initiallines"."$keyval\nfi\nexit";
 
-  $fp = fopen($file1,"w"); 
-  fwrite($fp, "$all_lines\n");
-  fclose($fp);
+//  $fp = fopen($file1,"w"); 
+//  fwrite($fp, "$all_lines\n");
+//  fclose($fp);
   //execute shell script for matlab
  // $cmd="./runmat_inv.sh $keyval";
 //  system($cmd);
-shell_exec('./runmat_inv.sh '.$keyval);
+shell_exec('./run_octave_inv '.$keyval);