Skip to content

GitLab

Commit f6fe2059 authored by pfreon's avatar pfreon
Browse files

Cosmetic changes & new datafiles 

Addition of data files Tunisia & Chile.
Cosmetic changes in texts of outputs.
parent 4cfa6286
Hide whitespace changes
Inline Side-by-side
example_data/Jurel Libro3 2021 erreur effort.CLI 0 → 100644
View file @ f6fe2059
Years;Production;Effort;Environment
1983;3116548.669;5194.247782;13.97925
1984;4932756.069;9050.928567;13.46575
1985;4701866.377;9329.099954;13.74208
1986;5055810.11;12331.24417;13.62883
1987;5348284.237;10675.21804;14.02217
1988;7234008.676;16111.3779;13.467
1989;8680524.429;21223.77611;13.72275
1990;10473776.28;29503.59515;13.463
1991;10345238.79;28343.11997;13.502
1992;10350238.13;31846.88655;13.53958
1993;12284182.56;44832.78307;13.58817
1994;15829945.59;58629.42811;13.89825
1995;18204259.2;66927.42353;13.71058
1996;18101691.42;74800.37777;13.76117
1997;20690814.24;118912.7255;13.981
1998;14215345.9;99408.01329;13.92433
1999;10167478.57;72624.84693;12.9526
2000;9679667.293;60878.41065;12.75708
2001;14499355.04;83329.62667;12.92883
2002;12591890.35;90589.13921;12.76492
2003;13326091.13;98711.78615;13.19317
2004;13405100.83;93090.97799;13.297
2005;11777811.2;79045.71275;13.08808
2006;13434966.54;89566.4436;13.09892
2007;17657420.12;156260.355;12.213
2008;19423799.09;255576.3038;13.24217
2009;20520426.2;325721.0508;12.95258
2010;17513040.36;427147.3259;12.337
2011;23604479.94;874239.9978;12.72108
2012;9231546.894;188398.9162;13.11992
2013;8841261.893;221031.5473;12.92725
2014;10856542.43;285698.485;12.8267
2015;10689400.92;288902.7276;13.52683
2016;7591551.22;148853.9455;13.88908
2017;5154254.777;65243.73135;13.55642
2018;6325997.596;76216.83851;13.5138
2019;5280484.95;44004.04125;13.1879
2020;4261737.705;27854.4948;12.84333
example_data/Jurel Libro3 2021.csv 0 → 100644
View file @ f6fe2059
Years;Production;Effort;Environment
1983;1870262;3116.548669;13.97925
1984;2686902;4932.756069;13.46575
1985;2370934;4701.866377;13.74208
1986;2072848;5055.81011;13.62883
1987;2679764;5348.284237;14.02217
1988;3245699;7234.008676;13.467
1989;3547077;8680.524429;13.72275
1990;3714757;10473.77628;13.463
1991;3777618;10345.23879;13.502
1992;3361674;10350.23813;13.53958
1993;3369598;12284.18256;13.58817
1994;4274793;15829.94559;13.89825
1995;4955186;18204.2592;13.71058
1996;4378844;18101.69142;13.76117
1997;3597117;20690.81424;13.981
1998;2025758;14215.3459;13.92433
1999;1423447;10167.47857;12.9526
2000;1540318;9679.667293;12.75708
2001;2527725;14499.35504;12.92883
2002;1750077;12591.89035;12.76492
2003;1797229;13326.09113;13.19317
2004;1934411;13405.10083;13.297
2005;1754673;11777.8112;13.08808
2006;2020136;13434.96654;13.09892
2007;1996975;17657.42012;12.213
2008;1472631;19423.79909;13.24217
2009;1283473;20520.4262;12.95258
2010;726573;17513.04036;12.337
2011;634800;23604.47994;12.72108
2012;454746;9231.546894;13.11992
2013;353120;8841.261893;12.92725
2014;410703;10856.54243;12.8267
2015;394332;10689.40092;13.52683
2016;389067;7591.55122;13.88908
2017;404609;5154.254777;13.55642
2018;526323;6325.997596;13.5138
2019;631546;5280.48495;13.1879
2020;649915;4261.737705;12.84333
example_data/data crevettes ete PK 95-11 nouveau.csv 0 → 100644
View file @ f6fe2059
Years;Production;Effort;Environment
1995;93981;243943;20.1
1996;75452;123897;20.0
1997;78513;388118;20.2
1998;76017;75493;20.3
1999;155716;79925;20.3
2000;69547;73635;20.4
2001;101695;125179;20.3
2002;58109;68549;20.1
2003;114946;67345;21.3
2004;95205;79903;20.0
2005;87258;74647;20.2
2006;134435;112063;20.6
2007;237581;172841;20.7
2008;138571;116284;20.4
2009;130648;108192;20.5
2010;119186;145901;20.2
2011;127276;133802;20.4
example_data/data-PK E div 1000Tunisie.csv 0 → 100644
View file @ f6fe2059
Years;Production;Effort;Environment
1998;1253.15599;2.425243827;16.72222222
1999;1105.90002;2.519152194;16.40833333
2000;1661.71961;2.362652135;17.08055556
2001;1320.31945;2.596998662;17.66944444
2002;900.66608;2.435754426;16.59722222
2003;869.0378;2.58090633;17.26388889
2004;1030.41265;2.767705104;17.11111111
2005;1363.27708;2.663131312;16.68888889
2006;1888.27199;3.012541145;17.09166667
2007;1731.54685;3.563379232;17.35
2008;1437.3338;3.663588829;17
2009;2809.12674;3.773609958;16.64722222
example_data/data-PK Tunisie.CLI 0 → 100644
View file @ f6fe2059
Years;Production;Effort;Environment;
1998;1253.15599;2425.243827;16.72222222;
1999;1105.90002;2519.152194;16.40833333;
2000;1661.71961;2362.652135;17.08055556;
2001;1320.31945;2596.998662;17.66944444;
2002;900.66608;2435.754426;16.59722222;
2003;869.0378;2580.90633;17.26388889;
2004;1030.41265;2767.705104;17.11111111;
2005;1363.27708;2663.131312;16.68888889;
2006;1888.27199;3012.541145;17.09166667;
2007;1731.54685;3563.379232;17.35;
2008;1437.3338;3663.588829;17;
2009;2809.12674;3773.609958;16.64722222;
src/fr/ird/climprod/CadreMain_AboutBox.java
View file @ f6fe2059
......@@ -49,13 +49,13 @@ public class CadreMain_AboutBox extends JDialog implements ActionListener {
jPanAbout.setLayout(borderLayout2);
jPanCmd.setLayout(flowLayout1);
jPanImage.setLayout(flowLayout1);
jPanImage.setBorder(new EmptyBorder(10, 10, 10, 10));
jPanImage.setBorder(new EmptyBorder(10, 20, 0, 0)); //1er = haut, 2ème = gauche, 3ème = bas; 4ème chiffre = marge droite
jPanText.add(jTextAreaCopyRight, null); // Utile? Effet non visible.
gridLayout1.setRows(4);
gridLayout1.setColumns(1);
jPanText.setLayout(gridLayout1);
jPanText.setBorder(new EmptyBorder(10, 60, 10, 10));
jPanText.setBorder(new EmptyBorder(10, 10, 10, 10));
cmdOK.setText("Ok");
cmdOK.addActionListener(this);
int condition = JComponent.WHEN_IN_FOCUSED_WINDOW;
......@@ -69,7 +69,7 @@ public class CadreMain_AboutBox extends JDialog implements ActionListener {
cmdOK.doClick();
}
});
jTextAreaCopyRight.setPreferredSize(new Dimension(450, 600));
jTextAreaCopyRight.setPreferredSize(new Dimension(450, 550));
jTextAreaCopyRight.setWrapStyleWord(true);
jTextAreaCopyRight.setRows(20);
jTextAreaCopyRight.setLineWrap(true);
......@@ -88,23 +88,23 @@ public class CadreMain_AboutBox extends JDialog implements ActionListener {
"and to Service des Editions, IRD, 213 Rue Lafayette, 75480 Paris Cedex 10, " +
"France.\n\n"+
"DISCLAIMER:The designations employed and the presentation of material " +
"in this information product do not imply the expression of any opinion " +
"whatsoever on the part of the Food and Agriculture Organization of the " +
"United Nations (FAO) and of the Institut Français de Recherche pour " +
"le Développement (IRD) concerning the legal or development status of any " +
"country, territory, city or area or of its authorities, or concerning the " +
"in this information product do not imply the expression of any opinion " +
"whatsoever on the part of the Food and Agriculture Organization of the " +
"United Nations (FAO) and of the Institut Français de Recherche pour " +
"le Développement (IRD) concerning the legal or development status of any " +
"country, territory, city or area or of its authorities, or concerning the " +
"delimitation of its frontiers or boundaries.\n" +
"FAO and IRD decline all responsibility for errors or deficiencies in the database " +
"or software or in the documentation accompanying it,for program maintenance " +
"and upgrading swell as for any damage that may arise from them. " +
"FAO and IRD also decline any responsibility for updating the data and assumes " +
"no responsibility for errors and omissions in the data provided. Users are, " +
"however, kindly asked to report any errors or deficiencies in this product " +
"to FAO and IRD. \n\n"+
"Note: Hyperlinks to non-FAO and non-IRD Internet sites do not imply " +
"any official endorsement of or responsibility or the opinions, ideas, " +
"for the opinions, ideas, data or products presented at these locations, " +
"or guarantee the validity of the information provided. The sole purpose " +
"FAO and IRD decline all responsibility for errors or deficiencies in the database " +
"or software or in the documentation accompanying it, for program maintenance " +
"and upgrading swell as for any damage that may arise from them. " +
"FAO and IRD also decline any responsibility for updating the data and assumes " +
"no responsibility for errors and omissions in the data provided. Users are, " +
"however, kindly asked to report any errors or deficiencies in this product " +
"to FAO and IRD.\n\n"+
"Note: Hyperlinks to non-FAO and non-IRD Internet sites do not imply " +
"any official endorsement of or responsibility or the opinions, ideas, " +
"for the opinions, ideas, data or products presented at these locations, " +
"or guarantee the validity of the information provided. The sole purpose " +
"of links to non-FAO and non-IRD sites is to indicate further information " +
"available on related topics.");
......
src/fr/ird/climprod/CadreMain_HowToBox.java
View file @ f6fe2059
......@@ -18,8 +18,6 @@ public class CadreMain_HowToBox extends JDialog implements ActionListener {
//ImageIcon imageIcon;
JTextArea jTextAreaCopyRight = new JTextArea();
BorderLayout borderLayout1 = new BorderLayout();
//BorderLayout borderLayout2 = new BorderLayout();
FlowLayout flowLayout1 = new FlowLayout();
......@@ -53,14 +51,13 @@ public class CadreMain_HowToBox extends JDialog implements ActionListener {
// jPanImage.setBorder(new EmptyBorder(10, 10, 10, 10));
// gridLayout1.setRows(4);
// gridLayout1.setColumns(1);
jTextAreaCopyRight.setText(
"HOW TO GET STARTED:\n\n" +
"You need first open a data file containing your data in four columns in a csv format " +
"using semicolons (;) as separators. The heading of the columns are: Year/season;Catches;Effort;Environment. " +
"Please note that from an ecological point of view it is often better to consider that the start of the " +
"fishing season is not the 1st of January and the same applied for your environmental variable. " +
"If the environment influences the catchability, the fishery and environmental values in a row must cover " +
"HOW TO GET STARTED (full details in Help -> Documentation -> Tutorial):\n\n" +
"You need first open a data file containing your data in four columns in a csv format using SEMICOLONS (;) as " +
"columns separators and FULL STOPS (PERIODS) as a decimal separators in numbers. The heading of the columns are: " +
"Year/season;Catches;Effort;Environment. Please note that from an ecological point of view it is often better " +
"to consider that the start of the fishing season is not the 1st of January and the same applied for your environmental " +
"variable. If the environment influences the catchability, the fishery and environmental values in a row must cover " +
"roughly the same months of the year (the higher the autocorrelations in series are, the rougher can be the matching). " +
"Furthermore, if there are several spawning seasons per year, your time interval can be shorter than " +
"12 months. In that case, please entre decimal values of years (e.g. 2000.0 and 200.5 for two semestral " +
......@@ -68,7 +65,7 @@ public class CadreMain_HowToBox extends JDialog implements ActionListener {
"Historical files of CLIMPROD had the extension .CLI and the names of the first and second columns were " +
"'Years' and 'Production' respectively. You can still use directly those old files including the EXAMPLE.CLI " +
"file available in your CLIMPROD folder. If you need to create a new data " +
"file available in your CLIMPROD directory. If you need to create a new data " +
"file you can either do it by using the sub-menu 'Create a new CLIMPROD data file' in the " +
"main menu 'File', or create it using a spreadsheet software (e.g. Excel, OpenOffice Calc) " +
"and save it under the .csv format using semicolons as separators. You will be able to import directly " +
......@@ -79,7 +76,7 @@ public class CadreMain_HowToBox extends JDialog implements ActionListener {
"different ways:\n\n1) You can make use of the sub-menu 'Select the appropriate model and fit it' in " +
"the 'Modelization' main menu. This is the recommended option. The expert system will ask you a " +
"number of questions, some them based on graphics or statistical results, in order to select " +
"the most appropriate model and try to validate it. You can activate the 'Trace all the procedure' " +
"the most appropriate model and try to validate it. You can tick the 'Trace all the procedure' " +
"facility in the main menu 'Option' although this talkative option (full transparency of the expert-system) " +
"is not recommended for a first use of CLIMPROD. \n\n2) You can decide to select yourself a model by using the sub-menu " +
"'Fit a model directly' in the menu 'Modelization', which supposes that you are familiar with surplus production " +
......@@ -90,7 +87,7 @@ public class CadreMain_HowToBox extends JDialog implements ActionListener {
"At the end of any of the two ‘Modelization’ options you will be able to use the ‘Display the results " +
"tables’ related to modelization and validation. If the model was validated, you will also access to " +
"the sub-menu ‘Intent prediction (allowed if good jackknife test)’. In any case you will be allowed to build and display a " +
"history html & graphs folder by using the corresponding sub-menu in the 'Files' main menu.\n\n");
"history html & graphs directory by using the corresponding sub-menu in the 'Files' main menu.\n\n");
jTextAreaCopyRight.setLineWrap(true);
jTextAreaCopyRight.setWrapStyleWord(true);
jTextAreaCopyRight.setPreferredSize(new Dimension(890, 610));
......
src/fr/ird/climprod/Cadre_Question.java
View file @ f6fe2059
......@@ -480,7 +480,7 @@ public class Cadre_Question extends JFrame
}
if ((Global.numero_modele < 6 && Global.numero_modele > 1) || Global.numero_modele == 20 || Global.numero_modele == 33) // Modèles CPUE=f(V) et modèle exponentiel additif
new MsgDialogBox(0, "MSY and MS-E graphs are not justified or available for this model.\nPlease continue.", 0, this);
new MsgDialogBox(0, "The model is validated. \nYou can use it for prediction, display result tables through \nthe 'Modelization' menu and built a folder containing .html and \n.jpg files of the history of all results (graphs & tables) and \nanswers to questions through the 'File' menu.", 1, this.parent);
new MsgDialogBox(0, "The model is validated. \nYou can use it for prediction, display result tables through \nthe 'Modelization' menu and built a directory containing .html and \n.jpg files of the history of all results (graphs & tables) and \nanswers to questions through the 'File' menu.", 1, this.parent);
QuestionReponse.reset();
this.dispose();
......
src/fr/ird/climprod/Cadre_Resultats.java
View file @ f6fe2059
......@@ -80,7 +80,7 @@ public class Cadre_Resultats extends JFrame {
jPanelValidation.add(jScrollPane4, null);
jPanelModelisation.setLayout(gridLayout1);
jScrollPane5.setBorder(new TitledBorder(BorderFactory.createEtchedBorder(Color.white, new Color(142, 142, 142)), "Mains results"));
jScrollPane5.setBorder(new TitledBorder(BorderFactory.createEtchedBorder(Color.white, new Color(142, 142, 142)), "Main results"));
jScrollPane6.setBorder(new TitledBorder(BorderFactory.createEtchedBorder(Color.white, new Color(142, 142, 142)), "Detailled results"));
jPanelModelisation.add(jScrollPane5, null);
jPanelModelisation.add(jScrollPane6, null);
......@@ -92,7 +92,7 @@ public class Cadre_Resultats extends JFrame {
jTableModelisation[1] = new JTable();
renseignerTable(jTableModelisation[1], Modele.getYearResult());
jScrollPane6.getViewport().add(jTableModelisation[1], null);
jTabbedPane.add("Modelisation", jPanelModelisation);
jTabbedPane.add("Modelization", jPanelModelisation);
jTableCopyPaste[] ModToClipboard;
ModToClipboard = new jTableCopyPaste[2];
for (int i = 0; i < 2; i++) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment