Changeset 14

Timestamp:

08/17/09 17:22:18 (15 years ago)

Author:

pinsard

Message:

script_correc : add header and octave compatibility

Location:

trunk/private

Files:

• intersect_octave.m (added)
• script_app.m (modified) (1 diff)
• script_correc.m (modified) (3 diffs)

trunk/private/script_app.m

@@ -12 +12 @@
     [nets(n,i).W1 nets(n,i).W2]=MLPinit(base_app_n(:,1:end-1),base_app_n(:,end),archi(n));
     
-    %Apprentissage du rseau
+    %Apprentissage du reseau
     [nets(n,i).W1 nets(n,i).W2]=MLPfit(base_val_n(:,1:end-1),base_val_n(:,end),base_app_n(:,1:end-1), ...
                                        base_app_n(:,end),nets(n,i).W1,nets(n,i).W2,'tah','lin',[1500,1e-6],[100,1]);

trunk/private/script_correc.m

@@ +1 @@
+%SCRIPT_CORREC correction
+
+%+
+% module
+% ======
+%
+% correction du TP
+%
+%
+% DESCRIPTION
+% ===========
+%
+% ++
+% 
+% EXAMPLES
+% ========
+%
+% ::
+%
+% >> addpath('../toolbox')
+% >> tp_mlp_aerosols_startup
+% >> more off
+% >> script_correc
+%
+% SEE ALSO
+% ========
+%
+% tp_mlp_aerosols_startup.m_
+%
+% .. _tp_mlp_aerosols_startup.m : tp_mlp_aerosols_startup.m.html
+%
+% intersect_octave.m_
+%
+% .. _intersect_octave.m : intersect_octave.m.html
+%
+% TODO
+% ====
+%
+% improve description
+%
+% avoid overriding existing output file
+%
+% make it launchable from everywhere (path and IO directories)
+%
+% Running octave, ``more off`` is compulsary but I don't not yet why
+%
+% save output (sdout and figures) to make comparisons possible
+%
+% EVOLUTIONS
+% ==========
+%
+% $Id$
+% 
+% - fplod 2009-08-17T12:39:51Z aedon.locean-ipsl.upmc.fr (Darwin)
+% 
+%   * add header
+%   * add octave intersect_octave
+%   * add octave suptitle_octave
+%
+%-
+
+
+
 %Ajout du path
 addpath ('../toolbox');
@@ -16 +79 @@
 
 %fusion 670nm avec 765nm
-[parambase,I1,I2]=intersect(LUT_NIR(i670,[1:5]),LUT_NIR(i765,[1:5]),'rows');
+if (run_octave == 0)
+ [parambase,I1,I2]=intersect(LUT_NIR(i670,[1:5]),LUT_NIR(i765,[1:5]),'rows');
+else
+ [parambase,I1,I2]=intersect_octave(LUT_NIR(i670,[1:5]),LUT_NIR(i765,[1:5]),'rows');
+end
 base=[parambase LUT_NIR(i670(I1),7) LUT_NIR(i765(I2),7)];
 
 %fusion de base avec 670nm avec base
-[parambase,I1,I2]=intersect(base(:,[1:5]),LUT_NIR(i865,[1:5]),'rows');
+if (run_octave == 0)
+ [parambase,I1,I2]=intersect(base(:,[1:5]),LUT_NIR(i865,[1:5]),'rows');
+else
+ [parambase,I1,I2]=intersect_octave(base(:,[1:5]),LUT_NIR(i865,[1:5]),'rows');
+end
 
 %base=[thetas,thetav,dphi,Rho_aer(670),Rho_aer(765),Rho_aer(865) tau]
@@ -74 +145 @@
 title('Test norm');
 
-suptitle(stitle{j});
+if (run_octave == 0)
+ suptitle(stitle{j});
+else
+ error('eee : octave can not write supertitle');
+end
 
 end