Merge branch 'NewStructure'

Closes ALSETLab#35 issue The commit on this branch have changes made to adress (a part of) issues ALSETLab#34 and ALSETLab#16
janlav · Mar 2, 2016 · a3c6d5d · a3c6d5d
2 parents bb521d6 + 61431ac
commit a3c6d5d
Show file tree

Hide file tree

Showing 64 changed files with 267 additions and 303 deletions.
diff --git a/Sources/core/functions/rapid.m b/Sources/core/functions/rapid.m
diff --git a/Sources/run_rapid_cmd.m → Templates/rapid_cmd_template.m b/Sources/run_rapid_cmd.m → Templates/rapid_cmd_template.m
diff --git a/rapid/Contents.m b/rapid/Contents.m
@@ -0,0 +1,31 @@
+% Rapid Parameter Identification Toolbox is a toolbox for automated parameter identification.
+%
+% RaPId core functions
+%   runRapidGui - Launches the Rapid Parameter Identification GUI
+%   rapid - the main function for running parameter identification - see at the end of this help text for function details
+%   setupRapid - Install the Rapid Parameter Identification Toolbox (run once)
+%
+% RaPId provided optimization algorithms: 
+%   own_ga - A genetic algorithm that is used in RaPId
+%   own_pso - A particle swarm optimization algorithm used in RaPid
+%
+% Copyright 2015-2016 Luigi Vanfretti, Achour Amazouz, Maxime Baudette, 
+% Tetiana Bogodorova, Jan Lavenius, Tin Rabuzin, Giuseppe Laera, 
+% Francisco Gomez-Lopez
+% 
+% The authors can be contacted by email: luigiv at kth dot se
+% 
+% This file is part of Rapid Parameter Identification ("RaPId") Toolbox.
+% 
+% RaPId is free software: you can redistribute it and/or modify
+% it under the terms of the GNU Lesser General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+% 
+% RaPId is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU Lesser General Public License for more details.
+% 
+% You should have received a copy of the GNU Lesser General Public License
+% along with RaPId. If not, see <a href="matlab:web('http://www.gnu.org/licenses/')">http://www.gnu.org/licenses/</a>.
diff --git a/Sources/copyright_statement → rapid/copyright_statement b/Sources/copyright_statement → rapid/copyright_statement
diff --git a/Sources/core/@RaPIdClass/RaPIdClass.m → rapid/core/@RaPIdClass/RaPIdClass.m b/Sources/core/@RaPIdClass/RaPIdClass.m → rapid/core/@RaPIdClass/RaPIdClass.m
diff --git a/Sources/core/@RaPIdClass/initRapidObj.m → rapid/core/@RaPIdClass/initRapidObj.m b/Sources/core/@RaPIdClass/initRapidObj.m → rapid/core/@RaPIdClass/initRapidObj.m
diff --git a/Sources/core/@RaPIdClass/updateRapidObj.m → rapid/core/@RaPIdClass/updateRapidObj.m b/Sources/core/@RaPIdClass/updateRapidObj.m → rapid/core/@RaPIdClass/updateRapidObj.m
diff --git a/Sources/core/algos/cg/cg_algo.m → rapid/core/algos/cg/cg_algo.m b/Sources/core/algos/cg/cg_algo.m → rapid/core/algos/cg/cg_algo.m
diff --git a/Sources/core/algos/fmincon/fmincon_algo.m → rapid/core/algos/fmincon/fmincon_algo.m b/Sources/core/algos/fmincon/fmincon_algo.m → rapid/core/algos/fmincon/fmincon_algo.m
diff --git a/Sources/core/algos/ga/Chromosome.m → rapid/core/algos/ga/Chromosome.m b/Sources/core/algos/ga/Chromosome.m → rapid/core/algos/ga/Chromosome.m
diff --git a/Sources/core/algos/ga/ChromosomeArray.m → rapid/core/algos/ga/ChromosomeArray.m b/Sources/core/algos/ga/ChromosomeArray.m → rapid/core/algos/ga/ChromosomeArray.m
diff --git a/Sources/core/algos/ga/gaSettings.fig → rapid/core/algos/ga/gaSettings.fig b/Sources/core/algos/ga/gaSettings.fig → rapid/core/algos/ga/gaSettings.fig
diff --git a/Sources/core/algos/ga/gaSettings.m → rapid/core/algos/ga/gaSettings.m b/Sources/core/algos/ga/gaSettings.m → rapid/core/algos/ga/gaSettings.m
diff --git a/Sources/core/algos/ga/ga_algo.m → rapid/core/algos/ga/ga_algo.m b/Sources/core/algos/ga/ga_algo.m → rapid/core/algos/ga/ga_algo.m
diff --git a/Sources/core/algos/ga/own_ga.m → rapid/core/algos/ga/own_ga.m b/Sources/core/algos/ga/own_ga.m → rapid/core/algos/ga/own_ga.m
@@ -1,4 +1,4 @@
-%% <Rapid Parameter Identification is a toolbox for automated parameter identification>
+% <Rapid Parameter Identification is a toolbox for automated parameter identification>
 %
 % Copyright 2015 Luigi Vanfretti, Achour Amazouz, Maxime Baudette, 
 % Tetiana Bogodorova, Jan Lavenius, Tin Rabuzin, Giuseppe Laera, 

diff --git a/Sources/core/algos/gaExt/gaExt_algo.m → rapid/core/algos/gaExt/gaExt_algo.m b/Sources/core/algos/gaExt/gaExt_algo.m → rapid/core/algos/gaExt/gaExt_algo.m
diff --git a/Sources/core/algos/knitro/knitro_algo.m → rapid/core/algos/knitro/knitro_algo.m b/Sources/core/algos/knitro/knitro_algo.m → rapid/core/algos/knitro/knitro_algo.m
diff --git a/Sources/core/algos/naive/naive.m → rapid/core/algos/naive/naive.m b/Sources/core/algos/naive/naive.m → rapid/core/algos/naive/naive.m
diff --git a/Sources/core/algos/naive/naiveSettings.fig → rapid/core/algos/naive/naiveSettings.fig b/Sources/core/algos/naive/naiveSettings.fig → rapid/core/algos/naive/naiveSettings.fig
diff --git a/Sources/core/algos/naive/naiveSettings.m → rapid/core/algos/naive/naiveSettings.m b/Sources/core/algos/naive/naiveSettings.m → rapid/core/algos/naive/naiveSettings.m
diff --git a/Sources/core/algos/naive/naive_algo.m → rapid/core/algos/naive/naive_algo.m b/Sources/core/algos/naive/naive_algo.m → rapid/core/algos/naive/naive_algo.m
diff --git a/Sources/core/algos/nm/nm_algo.m → rapid/core/algos/nm/nm_algo.m b/Sources/core/algos/nm/nm_algo.m → rapid/core/algos/nm/nm_algo.m
diff --git a/Sources/core/algos/nm/nmoutfun.m → rapid/core/algos/nm/nmoutfun.m b/Sources/core/algos/nm/nmoutfun.m → rapid/core/algos/nm/nmoutfun.m
diff --git a/...e/algos/pfNew/gaussianKernelProbability.m → ...e/algos/pfNew/gaussianKernelProbability.m b/...e/algos/pfNew/gaussianKernelProbability.m → ...e/algos/pfNew/gaussianKernelProbability.m
diff --git a/...core/algos/pfNew/generateRandomParticle.m → ...core/algos/pfNew/generateRandomParticle.m b/...core/algos/pfNew/generateRandomParticle.m → ...core/algos/pfNew/generateRandomParticle.m
diff --git a/Sources/core/algos/pfNew/own_pf.m → rapid/core/algos/pfNew/own_pf.m b/Sources/core/algos/pfNew/own_pf.m → rapid/core/algos/pfNew/own_pf.m
diff --git a/Sources/core/algos/pfNew/pfNew.m → rapid/core/algos/pfNew/pfNew.m b/Sources/core/algos/pfNew/pfNew.m → rapid/core/algos/pfNew/pfNew.m
diff --git a/Sources/core/algos/pfNew/pfWeighting.m → rapid/core/algos/pfNew/pfWeighting.m b/Sources/core/algos/pfNew/pfWeighting.m → rapid/core/algos/pfNew/pfWeighting.m
diff --git a/Sources/core/algos/pfNew/pf_algo.m → rapid/core/algos/pfNew/pf_algo.m b/Sources/core/algos/pfNew/pf_algo.m → rapid/core/algos/pfNew/pf_algo.m
diff --git a/Sources/core/algos/pso/Particle.m → rapid/core/algos/pso/Particle.m b/Sources/core/algos/pso/Particle.m → rapid/core/algos/pso/Particle.m
diff --git a/Sources/core/algos/pso/ParticleArray.m → rapid/core/algos/pso/ParticleArray.m b/Sources/core/algos/pso/ParticleArray.m → rapid/core/algos/pso/ParticleArray.m
diff --git a/Sources/core/algos/pso/own_cfapso.m → rapid/core/algos/pso/own_cfapso.m b/Sources/core/algos/pso/own_cfapso.m → rapid/core/algos/pso/own_cfapso.m
diff --git a/Sources/core/algos/pso/own_pso.m → rapid/core/algos/pso/own_pso.m b/Sources/core/algos/pso/own_pso.m → rapid/core/algos/pso/own_pso.m
diff --git a/Sources/core/algos/pso/psoSettings.fig → rapid/core/algos/pso/psoSettings.fig b/Sources/core/algos/pso/psoSettings.fig → rapid/core/algos/pso/psoSettings.fig
diff --git a/Sources/core/algos/pso/psoSettings.m → rapid/core/algos/pso/psoSettings.m b/Sources/core/algos/pso/psoSettings.m → rapid/core/algos/pso/psoSettings.m
diff --git a/Sources/core/algos/pso/pso_algo.m → rapid/core/algos/pso/pso_algo.m b/Sources/core/algos/pso/pso_algo.m → rapid/core/algos/pso/pso_algo.m
diff --git a/Sources/core/algos/psoExt/psoExt_algo.m → rapid/core/algos/psoExt/psoExt_algo.m b/Sources/core/algos/psoExt/psoExt_algo.m → rapid/core/algos/psoExt/psoExt_algo.m
diff --git a/Sources/core/functions/func.m → rapid/core/functions/func.m b/Sources/core/functions/func.m → rapid/core/functions/func.m
diff --git a/...s/core/functions/generateOrganisedSwarm.m → ...d/core/functions/generateOrganisedSwarm.m b/...s/core/functions/generateOrganisedSwarm.m → ...d/core/functions/generateOrganisedSwarm.m
diff --git a/Sources/core/functions/particle.m → rapid/core/functions/particle.m b/Sources/core/functions/particle.m → rapid/core/functions/particle.m