[Octave-cvsupdate] SF.net SVN: octave:[7173] trunk/octave-forge/main/nnet

[<mic...@us...>]

Revision: 7173
          http://octave.svn.sourceforge.net/octave/?rev=7173&view=rev
Author:   michaelschmid
Date:     2010-04-11 18:53:31 +0000 (Sun, 11 Apr 2010)

Log Message:
-----------
* progress message shown without delay
* bug removed from "newff.m" since version 3.2.x

Modified Paths:
--------------
    trunk/octave-forge/main/nnet/DESCRIPTION
    trunk/octave-forge/main/nnet/inst/__trainlm.m
    trunk/octave-forge/main/nnet/inst/newff.m

Modified: trunk/octave-forge/main/nnet/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/nnet/DESCRIPTION	2010-04-11 02:11:48 UTC (rev 7172)
+++ trunk/octave-forge/main/nnet/DESCRIPTION	2010-04-11 18:53:31 UTC (rev 7173)
@@ -1,6 +1,6 @@
 Name: nnet
-Version: 0.1.11.0
-Date: 2020-02-23
+Version: 0.1.12.0
+Date: 2010-04-11
 Author: Michael Schmid
 Maintainer: Michael Schmid
 Title: Neural Networks

Modified: trunk/octave-forge/main/nnet/inst/__trainlm.m
===================================================================
--- trunk/octave-forge/main/nnet/inst/__trainlm.m	2010-04-11 02:11:48 UTC (rev 7172)
+++ trunk/octave-forge/main/nnet/inst/__trainlm.m	2010-04-11 18:53:31 UTC (rev 7173)
@@ -147,7 +147,7 @@
 		  goal,perf,minGrad,normGradX,shortStr,net);
 
     ## show performance plot, if needed
-    if !(strcmp(show,"NaN"))
+    if !isnan(show) # if no performance plot is needed
       ## now make it possible to define after how much loops the
       ## performance plot should be updated
       if (mod(iEpochs,show)==0)
@@ -158,7 +158,7 @@
 	endif
       endif
     endif # if !(strcmp(show,"NaN"))
-    legend("Training","Validation");
+#    legend("Training","Validation");
 
     ## stop if one of the criterias is reached.
     if length(stop)
@@ -305,20 +305,21 @@
       fprintf(shortStr);   # outputs the training algorithm
       if isfinite(epochs)
         fprintf(", Epoch %g/%g",iEpochs, epochs);
-	  endif
-	  if isfinite(time)
+      endif
+      if isfinite(time)
         fprintf(", Time %4.1f%%",currentTime/time*100);   # \todo: Time wird nicht ausgegeben
-	  endif
-	  if isfinite(goal)
-	    fprintf(", %s %g/%g",upper(net.performFcn),perf,goal); # outputs the performance function
-	  endif
-	  if isfinite(minGrad)
+      endif
+      if isfinite(goal)
+        fprintf(", %s %g/%g",upper(net.performFcn),perf,goal); # outputs the performance function
+      endif
+      if isfinite(minGrad)
         fprintf(", Gradient %g/%g",normGradX,minGrad);
-	  endif
-	  fprintf("\n")
+      endif
+      fprintf("\n")
       if length(stop)
-	    fprintf("%s, %s\n\n",shortStr,stop);
-	  endif
+        fprintf("%s, %s\n\n",shortStr,stop);
+      endif
+      fflush(stdout); # writes output to stdout as soon as output messages are available
     endif
   endfunction
   

Modified: trunk/octave-forge/main/nnet/inst/newff.m
===================================================================
--- trunk/octave-forge/main/nnet/inst/newff.m	2010-04-11 02:11:48 UTC (rev 7172)
+++ trunk/octave-forge/main/nnet/inst/newff.m	2010-04-11 18:53:31 UTC (rev 7173)
@@ -114,7 +114,10 @@
   ## set size of IW
   net.IW{1,1} = zeros(1,nRows);
   ## set more needed empty cells
-  net.IW{2:nLayers,1} = [];
+  for iLayers = 2:nLayers
+    net.IW{iLayers,1} = [];
+    #  net.IW{2:nLayers,1} = [];    # old code
+  endfor
   ## set number of bias, one per layer
   for iBiases = 1:nLayers
     net.b{iBiases,1} = 0;
@@ -273,4 +276,4 @@
 %!test
 %! Pr = [1 2 ; 4 6];
 %! fail("newff(Pr,[-1 1],{'tansig','purelin'},'trainlm','unused','mse')",\
-%!  "Layer sizes is not a row vector of positive integers.")
\ No newline at end of file
+%!  "Layer sizes is not a row vector of positive integers.")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.