Commit a10bee02 authored by pfreon's avatar pfreon
Browse files

Minor update CadreMain.java

Rajout de sauts de lignes avant { et }.
parent 3337dcb3
......@@ -807,39 +807,37 @@ public class CadreMain extends JFrame {
}
}
if (Global.modelisationOk) {
if (Global.modelisationOk)
{
faits = faits + s + "Selected model: " + RechercheModele.getEquation() + s;
faits = faits + "Number of years used to fit the model: " + Data.getNbDataRetenue() + s;
faits = faits + "Number of degrees of freedom: " + Integer.toString(Data.getNbDataRetenue() - Global.nbre_param) + s + s;
// faits=faits +"Parameters"+"\t"+"Actual value"+" "+"\t"+"Initial value"+s;
String[][] res$ = (String[][]) Modele.getResult();
for (int i = 0; i < Global.nbre_param + 1; i++) {
for (int i = 0; i < Global.nbre_param + 1; i++)
{
for (int j = 0; j < res$[i].length; j++) //faits=faits+" "+res$[i][j]+" "+"\t";
{
faits = faits + res$[i][j] + "\t";
}
{faits = faits + res$[i][j] + "\t";}
faits = faits + s;
}
}
faits = faits + s;
for (int i = Global.nbre_param + 3; i < res$.length; i++) {
for (int j = 0; j < res$[i].length; j++) {
if (res$[i][j] != null) {
faits = faits + res$[i][j] + "\t";
for (int i = Global.nbre_param + 3; i < res$.length; i++)
{
for (int j = 0; j < res$[i].length; j++)
{
if (res$[i][j] != null)
{faits = faits + res$[i][j] + "\t";}
}
}
faits = faits + s;
}
}
if (Global.validationOk) {
if (Global.validationOk)
{
if (Global.test_jackknife)
{faits = faits + s + "Overall T_Jackknife on parameters: good" + s;}
else {faits = faits + s + "Overall T_Jackknife on parameters: bad" + s;}
faits = faits + s + "Jackknife coefficient of determination R²: " + nf.format(Global.jackknife) + s;
if (Global.test_jackknife) {
faits = faits + s + "T_Jackknife: good" + s;
} else {
faits = faits + s + "T_Jackknife: bad" + s;
}
faits = faits + s + "Fisher test of R² for F(" + getNbDataRetenue() + "," + Global.nbre_param +") : "+
Global.pfisher(Global.coeff_determination, getNbDataRetenue(), Global.nbre_param);
faits = faits + s + "Fisher threshold : "+
......
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