Skip to content

GitLab

Commit 90be28b5 authored by pfreon's avatar pfreon
Browse files

Addition of a column "Computed V" in the table of prediction 

Addition of a column "Computed V" (averaged and lagged V value)  in the table of prediction.
Addition of data files Jurel Chile and logos FAO & IRD.
parent e6fb6f2a
Hide whitespace changes
Inline Side-by-side
example_data/JUREL DOS Telo. E div 1000csv.csv 0 → 100644
View file @ 90be28b5
Years;Production;Effort;Environment
1983;1870262;3116.549;13.98
1984;2686902;4932.756;13.47
1985;2370934;4701.866;13.74
1986;2072848;5055.81;13.63
1987;2679764;5348.284;14.02
1988;3245699;7234.009;13.47
1989;3547077;8680.524;13.72
1990;3714757;10473.776;13.46
1991;3777618;10345.239;13.5
1992;3361674;10350.238;13.54
1993;3369598;12284.183;13.59
1994;4274793;15829.946;13.9
1995;4955186;18204.259;13.71
1996;4378844;18101.691;13.76
1997;3597117;20690.814;13.98
1998;2025758;14215.346;13.92
1999;1423447;10167.479;13.06756
2000;1540318;9679.667;12.76
2001;2527725;14499.355;12.93
2002;1750077;12591.89;12.76
2003;1797229;13326.091;13.19
2004;1934411;13405.101;13.3
2005;1754673;11777.811;13.09
2006;2020136;13434.967;13.1
2007;1996975;17657.42;12.21
2008;1472631;19423.799;13.24
2009;1283473;20520.426;12.95
2010;726573;17513.04;12.34
2011;634800;23604.48;12.72
2012;454746;9231.547;12.11992
2013;353120;8841.262;12.9273
2014;410703;10856.542;12.83
2015;394332;10689.401;13.53
2016;389067;7591.551;13.89
2017;404845;5154.255;13.56
2018;526323;6325.998;13.51
2019;631545;5280.485;13.19
2020;649915;4261.738;12.84333
example_data/JUREL DOS Telo.CLI 0 → 100644
View file @ 90be28b5
Years;Production;Effort;Environment
1983.000000 1870262.000000 3116549.000000 13.980000
1984.000000 2686902.000000 4932756.000000 13.470000
1985.000000 2370934.000000 4701866.000000 13.740000
1986.000000 2072848.000000 5055810.000000 13.630000
1987.000000 2679764.000000 5348284.000000 14.020000
1988.000000 3245699.000000 7234009.000000 13.470000
1989.000000 3547077.000000 8680524.000000 13.720000
1990.000000 3714757.000000 10473776.000000 13.460000
1991.000000 3777618.000000 10345239.000000 13.500000
1992.000000 3361674.000000 10350238.000000 13.540000
1993.000000 3369598.000000 12284183.000000 13.590000
1994.000000 4274793.000000 15829946.000000 13.900000
1995.000000 4955186.000000 18204259.000000 13.710000
1996.000000 4378844.000000 18101691.000000 13.760000
1997.000000 3597117.000000 20690814.000000 13.980000
1998.000000 2025758.000000 14215346.000000 13.920000
1999.000000 1423447.000000 10167479.000000 13.067560
2000.000000 1540318.000000 9679667.000000 12.760000
2001.000000 2527725.000000 14499355.000000 12.930000
2002.000000 1750077.000000 12591890.000000 12.760000
2003.000000 1797229.000000 13326091.000000 13.190000
2004.000000 1934411.000000 13405101.000000 13.300000
2005.000000 1754673.000000 11777811.000000 13.090000
2006.000000 2020136.000000 13434967.000000 13.100000
2007.000000 1996975.000000 17657420.000000 12.210000
2008.000000 1472631.000000 19423799.000000 13.240000
2009.000000 1283473.000000 20520426.000000 12.950000
2010.000000 726573.000000 17513040.000000 12.340000
2011.000000 634800.000000 23604480.000000 12.720000
2012.000000 454746.000000 9231547.000000 12.119920
2013.000000 353120.000000 8841262.000000 12.927300
2014.000000 410703.000000 10856542.000000 12.830000
2015.000000 394332.000000 10689401.000000 13.530000
2016.000000 389067.000000 7591551.000000 13.890000
2017.000000 404845.000000 5154255.000000 13.560000
2018.000000 526323.000000 6325998.000000 13.510000
2019.000000 631545.000000 5280485.000000 13.190000
2020.000000 649915.000000 4261738.000000 12.843330
example_data/JUREL DOS Telo.csv 0 → 100644
View file @ 90be28b5
Years;Production;Effort;Environment
1983;1870262;3116549;13.98
1984;2686902;4932756;13.47
1985;2370934;4701866;13.74
1986;2072848;5055810;13.63
1987;2679764;5348284;14.02
1988;3245699;7234009;13.47
1989;3547077;8680524;13.72
1990;3714757;10473776;13.46
1991;3777618;10345239;13.5
1992;3361674;10350238;13.54
1993;3369598;12284183;13.59
1994;4274793;15829946;13.9
1995;4955186;18204259;13.71
1996;4378844;18101691;13.76
1997;3597117;20690814;13.98
1998;2025758;14215346;13.92
1999;1423447;10167479;13.06756
2000;1540318;9679667;12.76
2001;2527725;14499355;12.93
2002;1750077;12591890;12.76
2003;1797229;13326091;13.19
2004;1934411;13405101;13.3
2005;1754673;11777811;13.09
2006;2020136;13434967;13.1
2007;1996975;17657420;12.21
2008;1472631;19423799;13.24
2009;1283473;20520426;12.95
2010;726573;17513040;12.34
2011;634800;23604480;12.72
2012;454746;9231547;12.11992
2013;353120;8841262;12.9273
2014;410703;10856542;12.83
2015;394332;10689401;13.53
2016;389067;7591551;13.89
2017;404845;5154255;13.56
2018;526323;6325998;13.51
2019;631545;5280485;13.19
2020;649915;4261738;12.84333
example_data/Jurel Libro3 2021 datos crudos.csv 0 → 100644
View file @ 90be28b5
Years;Production;Effort;Environment
1983;1870262;3116548.669;13.97925
1984;2686902;4932756.069;13.46575
1985;2370934;4701866.377;13.74208
1986;2072848;5055810.11;13.62883
1987;2679764;5348284.237;14.02217
1988;3245699;7234008.676;13.467
1989;3547077;8680524.429;13.72275
1990;3714757;10473776.28;13.463
1991;3777618;10345238.79;13.502
1992;3361674;10350238.13;13.53958
1993;3369598;12284182.56;13.58817
1994;4274793;15829945.59;13.89825
1995;4955186;18204259.2;13.71058
1996;4378844;18101691.42;13.76117
1997;3597117;20690814.24;13.981
1998;2025758;14215345.9;13.92433
1999;1423447;10167478.57;12.9526
2000;1540318;9679667.293;12.75708
2001;2527725;14499355.04;12.92883
2002;1750077;12591890.35;12.76492
2003;1797229;13326091.13;13.19317
2004;1934411;13405100.83;13.297
2005;1754673;11777811.2;13.08808
2006;2020136;13434966.54;13.09892
2007;1996975;17657420.12;12.213
2008;1472631;19423799.09;13.24217
2009;1283473;20520426.2;12.95258
2010;726573;17513040.36;12.337
2011;634800;23604479.94;12.72108
2012;454746;9231546.894;13.11992
2013;353120;8841261.893;12.92725
2014;410703;10856542.43;12.8267
2015;394332;10689400.92;13.52683
2016;389067;7591551.22;13.88908
2017;404609;5154254.777;13.55642
2018;526323;6325997.596;13.5138
2019;631546;5280484.95;13.1879
2020;649915;4261737.705;12.84333
src/fr/ird/climprod/Cadre_Prediction.java
View file @ 90be28b5
......@@ -37,7 +37,7 @@ public class Cadre_Prediction extends JDialog implements DocumentListener {
initWindow();
renseignerTable();
this.setSize(700, 500);
this.setSize(800, 500);
UtilCadre.Centrer(this);
} catch (Exception e) {
......@@ -59,9 +59,9 @@ public class Cadre_Prediction extends JDialog implements DocumentListener {
vbar = new double[nim];
for (i = 0; i < nim; i++) {
year[i] = data[i + decalmax][0];
yexp[i] = data[i + decalmax][1];
yexp[i] = data[i + decalmax][1]; // Catches
v[i] = data[i + decalmax][3];
fb[i] = data[i + decalmax][2];
fb[i] = data[i + decalmax][2]; // E
f[i] = 0;
vbar[i] = 0;
for (d = 0; d <= decalmax; d++) {
......@@ -90,8 +90,8 @@ public class Cadre_Prediction extends JDialog implements DocumentListener {
if (agerec < 1) {
agerec = 0;
}
if (agerec > 10) {
agerec = 10;
if (agerec > 8) {
agerec = 8;
}
if (ending < begining) {
begining = ending;
......@@ -160,28 +160,30 @@ public class Cadre_Prediction extends JDialog implements DocumentListener {
private void renseignerTable() {
int c = year.length;
String[] title$ = {"Years ", "Obs. Catches", "Effort", "Environment", "Computed Effort", "Obs. C.P.U.E", "Pred. C.P.U.E"};
Object[][] data$ = new String[c][7];
String[] title$ = {"Years ", "Obs. Catches", "Effort (E)", "Environment (V)", "Computed E", "Computed V", "Obs. C.P.U.E", "Pred. C.P.U.E"};
Object[][] data$ = new String[c][8];
Locale loc = new Locale("en", "US");
NumberFormat nf;
nf = NumberFormat.getNumberInstance(loc);
nf.setMaximumFractionDigits(4);
nf.setGroupingUsed(false);
for (int i = 0; i < c; i++) {
for (int i = 0; i < c; i++) { // c = nb of years
data$[i][0] = nf.format(year[i]);
data$[i][1] = nf.format(yexp[i]);
data$[i][2] = nf.format(fb[i]);
data$[i][3] = nf.format(v[i]);
data$[i][4] = nf.format(f[i]);
data$[i][5] = nf.format(pue[i]);
data$[i][1] = nf.format(yexp[i]); // Catches
data$[i][2] = nf.format(fb[i]); // E
data$[i][3] = nf.format(v[i]); // V
data$[i][4] = nf.format(f[i]); // Averaged-Weighted E
data$[i][5] = nf.format(vbar[i]); // Averaged-Weighted V
data$[i][6] = nf.format(pue[i]); // Observed CPUE
double e = EquationModele.fonction_modele(f[i], v[i], vbar[i], Global.val_param);
data$[i][6] = nf.format(e);
data$[i][7] = nf.format(e); // Predicted CPUE
}
data$[c - 2][1] = data$[c - 1][1] = "-";
data$[c - 2][5] = data$[c - 1][5] = "-";
data$[c - 2][6] = data$[c - 1][6] = "-";
if (!prediction) {
data$[c - 2][4] = data$[c - 1][4] = "-";
data$[c - 2][6] = data$[c - 1][6] = "-";
data$[c - 2][5] = data$[c - 1][5] = "-";
data$[c - 2][7] = data$[c - 1][7] = "-";
}
ModeleDeTablePredict mdt = new ModeleDeTablePredict(data$, title$);
jTablePrediction.setModel(mdt);
......@@ -315,7 +317,7 @@ public class Cadre_Prediction extends JDialog implements DocumentListener {
}
/**
* Mod�le de table g�rant l'affichage dans jTabStat.
* Modèle de table gérant l'affichage dans jTabStat.
*/
class ModeleDeTablePredict extends AbstractTableModel {
......
Supports Markdown
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