[Octave-cvsupdate] SF.net SVN: octave:[10396] trunk/octave-forge/extra/control-devel/devel

[<par...@us...>]

Revision: 10396
          http://octave.svn.sourceforge.net/octave/?rev=10396&view=rev
Author:   paramaniac
Date:     2012-05-10 07:44:00 +0000 (Thu, 10 May 2012)
Log Message:
-----------
control-devel: fix test examples from DaISy library, first column is sample number

Modified Paths:
--------------
    trunk/octave-forge/extra/control-devel/devel/Destillation.m
    trunk/octave-forge/extra/control-devel/devel/PowerPlant.m

Modified: trunk/octave-forge/extra/control-devel/devel/Destillation.m
===================================================================
--- trunk/octave-forge/extra/control-devel/devel/Destillation.m	2012-05-10 07:32:55 UTC (rev 10395)
+++ trunk/octave-forge/extra/control-devel/devel/Destillation.m	2012-05-10 07:44:00 UTC (rev 10396)
@@ -52,9 +52,11 @@
 
 clear all, close all, clc
 
+% DaISy code is wrong,
+% first column is sample number
 load destill.dat
-U=destill(:,1:20);
-Y=destill(:,21:32);
+U=destill(:,2:21);
+Y=destill(:,22:33);
 U_dest=U(:,1:5);
 U_dest_n10=U(:,6:10);
 U_dest_n20=U(:,11:15);	

Modified: trunk/octave-forge/extra/control-devel/devel/PowerPlant.m
===================================================================
--- trunk/octave-forge/extra/control-devel/devel/PowerPlant.m	2012-05-10 07:32:55 UTC (rev 10395)
+++ trunk/octave-forge/extra/control-devel/devel/PowerPlant.m	2012-05-10 07:44:00 UTC (rev 10396)
@@ -42,10 +42,14 @@
 
 close all, clc
 
+% NB: the code from DaISy is wrong:
+%     powerplant(:,1) is just the sample number
+%     therefore increase indices by one
+%     it took me weeks to find that silly mistake ...
 load powerplant.dat
-U=powerplant(:,1:5);
-Y=powerplant(:,6:8);
-Yr=powerplant(:,9:11);
+U=powerplant(:,2:6);
+Y=powerplant(:,7:9);
+Yr=powerplant(:,10:12);
 
 inname = {'gas flow',
           'turbine valves opening',

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