about summary refs log tree commit diff
path: root/sourcecodes/parameter_learning
diff options
context:
space:
mode:
authorPjotr <wrk@bosa.lan>2026-09-28 14:48:57 +0000
committerPjotr <wrk@bosa.lan>2026-09-28 14:51:45 +0000
commit7f460113cc9c7eca91935549c25d78a9393e0977 (patch)
treee9a05e98fdaf571cd15975c6a1e3e73727b84bf2 /sourcecodes/parameter_learning
parent8380798b1c60c9844b9952921a8a7361e2fb28cd (diff)
downloadgn-bnw-7f460113cc9c7eca91935549c25d78a9393e0977.tar.gz
container: deployment fixes for the Guix container/VM
Changes previously carried as bnw-container-paths.patch in
guix-bioinformatics, now applied to the source directly:

* unify data directories on /var/lib/genenet/bnw (was /tmp/bnw and
  ./data/ mixed)
* make the shell_exec paths __DIR__-relative and the example/octave
  helper scripts location-independent, so php-fpm can run them from
  any working directory
* use core-octave randn/exp instead of the statistics-package
  normrnd/normpdf (not available in the container's octave)
* nnodes: strtrim before strfind so the node count parses with the
  container's octave output
* python3 instead of a hardcoded /home/jziebart path
* add diag.php, a debug page showing the request and data state
* bn_genenet.php: serve the GeneNetwork (GN2) handshake server-side;
  the My_Gennenet POST is converted (commas -> tabs, semicolons ->
  newlines) in PHP and the prepared-data page is returned in ONE
  request.  This removes the raw-echo of  into a JavaScript
  string (an XSS hole on public deployments) and is backward
  compatible for GN2 (same POST, better response).
Diffstat (limited to 'sourcecodes/parameter_learning')
-rw-r--r--sourcecodes/parameter_learning/createJSON.m2
-rw-r--r--sourcecodes/parameter_learning/createSVG.m2
-rw-r--r--sourcecodes/parameter_learning/drawFigure.m4
-rw-r--r--sourcecodes/parameter_learning/drawFigureM.m4
-rw-r--r--sourcecodes/parameter_learning/prepareInput.m2
-rw-r--r--sourcecodes/parameter_learning/removeNodes.m2
-rw-r--r--sourcecodes/parameter_learning/testSetPredictions.m2
7 files changed, 9 insertions, 9 deletions
diff --git a/sourcecodes/parameter_learning/createJSON.m b/sourcecodes/parameter_learning/createJSON.m
index 59a3aec4..ca746e2e 100644
--- a/sourcecodes/parameter_learning/createJSON.m
+++ b/sourcecodes/parameter_learning/createJSON.m
@@ -22,7 +22,7 @@ end
 
 % Read in first line to get the number of nodes and the node labels.
 buffer = strtrim(fgetl(fin));    %get header line as a string
-nnodes = numel(strfind(buffer,"\t"))+1;
+nnodes = numel(strfind(strtrim(buffer),"\t")) + 1;
 labels = cell(1,nnodes);
 for j=1:nnodes
     [next,buffer] = strtok(buffer);
diff --git a/sourcecodes/parameter_learning/createSVG.m b/sourcecodes/parameter_learning/createSVG.m
index 47894c1b..88389bff 100644
--- a/sourcecodes/parameter_learning/createSVG.m
+++ b/sourcecodes/parameter_learning/createSVG.m
@@ -26,7 +26,7 @@ end
 
 % Read in first line to get the number of nodes and the node labels.
 buffer = fgetl(fin);    %get header line as a string
-nnodes = numel(strfind(buffer,"\t")) + 1;
+nnodes = numel(strfind(strtrim(buffer),"\t")) + 1;
 labels = cell(1,nnodes);
 for j=1:nnodes
     [next,buffer] = strtok(buffer);
diff --git a/sourcecodes/parameter_learning/drawFigure.m b/sourcecodes/parameter_learning/drawFigure.m
index 8255f6b9..ea752556 100644
--- a/sourcecodes/parameter_learning/drawFigure.m
+++ b/sourcecodes/parameter_learning/drawFigure.m
@@ -161,7 +161,7 @@ for i = 1:nnodes,
         for j=1:no_gaussians
                 normrnd_count = int16(1000*weights(j));
                 if normrnd_count > 0
-		    violin_data = normrnd(s.mean(j),sqrt(s.cov(j)),normrnd_count,1);
+		    violin_data = s.mean(j) + sqrt(s.cov(j))*randn(normrnd_count,1);
 		%violin_data = normrnd(s.mean(j),sqrt(s.cov(j)),1000,1);
 		    for k = 1:size(violin_data)
 		      fprintf(vfile,'%6.4f\n',violin_data(k));
@@ -267,7 +267,7 @@ for i = 1:100,
 end
 
 for i = 1:101,
-    y_vals(i,1) = normpdf(x_vals(i,1),mu,Sigma);
+    y_vals(i,1) = exp(-((x_vals(i,1)-mu)^2)/(2*Sigma))/(sqrt(2*pi)*Sigma);
 end
 
 end
diff --git a/sourcecodes/parameter_learning/drawFigureM.m b/sourcecodes/parameter_learning/drawFigureM.m
index 4a666ada..a133b01a 100644
--- a/sourcecodes/parameter_learning/drawFigureM.m
+++ b/sourcecodes/parameter_learning/drawFigureM.m
@@ -153,7 +153,7 @@ for i = 1:nnodes,
         end
 
         %Get random samples from normals to make violin plots
-        violin_data = normrnd(predict.mu,sqrt(predict.Sigma),1000,1);
+        violin_data = predict.mu + sqrt(predict.Sigma)*randn(1000,1);
         %violin_data = normrnd(s.mean(j),sqrt(s.cov(j)),1000,1);
         for k = 1:size(violin_data)
             fprintf(vfile,'%6.4f\n',violin_data(k));
@@ -254,7 +254,7 @@ for i = 1:100,
 end
 
 for i = 1:101,
-    y_vals(i,1) = normpdf(x_vals(i,1),mu,Sigma);
+    y_vals(i,1) = exp(-((x_vals(i,1)-mu)^2)/(2*Sigma))/(sqrt(2*pi)*Sigma);
 end
 
 end
diff --git a/sourcecodes/parameter_learning/prepareInput.m b/sourcecodes/parameter_learning/prepareInput.m
index 638dfece..b2b2a630 100644
--- a/sourcecodes/parameter_learning/prepareInput.m
+++ b/sourcecodes/parameter_learning/prepareInput.m
@@ -59,7 +59,7 @@ frewind(fin);
 
 % Read in first line to get the number of nodes and the node labels.
 buffer = fgetl(fin);    %get header line as a string
-nnodes = numel(strfind(buffer,"\t")) + 1;
+nnodes = numel(strfind(strtrim(buffer),"\t")) + 1;
 labels = cell(1,nnodes);
 for j=1:nnodes
     [next,buffer] = strtok(buffer);
diff --git a/sourcecodes/parameter_learning/removeNodes.m b/sourcecodes/parameter_learning/removeNodes.m
index 45f09cb7..d5caee67 100644
--- a/sourcecodes/parameter_learning/removeNodes.m
+++ b/sourcecodes/parameter_learning/removeNodes.m
@@ -34,7 +34,7 @@ frewind(fin);
 
 % Read in first line to get the number of nodes and the node labels.
 buffer = fgetl(fin);    %get header line as a string
-nnodes = numel(strfind(buffer,"\t")) + 1;
+nnodes = numel(strfind(strtrim(buffer),"\t")) + 1;
 labels = cell(1,nnodes);
 for j=1:nnodes
     [next,buffer] = strtok(buffer);
diff --git a/sourcecodes/parameter_learning/testSetPredictions.m b/sourcecodes/parameter_learning/testSetPredictions.m
index 978326b0..09c2ff7e 100644
--- a/sourcecodes/parameter_learning/testSetPredictions.m
+++ b/sourcecodes/parameter_learning/testSetPredictions.m
@@ -38,7 +38,7 @@ buffer = fgetl(fin);
 
 % Read in second line to get the number of nodes and the node labels.
 buffer = fgetl(fin);    %get header line as a string
-nnodes = numel(strfind(buffer,"\t")) + 1;
+nnodes = numel(strfind(strtrim(buffer),"\t")) + 1;
 labels_test = cell(1,nnodes);
 for j=1:nnodes
     [next,buffer] = strtok(buffer);