Révision 327

tmp/org.txm.ca.core/src/org/txm/ca/core/statsengine/r/functions/FactoMineRCA.java (revision 327)
106 106
	public FactoMineRCA(ILexicalTable table) throws StatException {
107 107

  
108 108
		if (!rw.containsVariable(table.getSymbol())) {
109
			throw new StatException(CACoreMessages.ERROR_0);
109
			throw new StatException(CACoreMessages.error_lexicalTableNotFoundInWorkspace);
110 110
		}
111 111

  
112 112
		loadLibrary();
......
116 116
			//rw.callFunctionAndAffect("FactoMineR:CA", new String[] { table.getSymbol() }, symbol); //$NON-NLS-1$
117 117
			rw.eval(symbol+" <- FactoMineR::CA("+table.getSymbol()+", graph=FALSE)"); //$NON-NLS-1$ //$NON-NLS-2$
118 118
		} catch (RWorkspaceException e) {
119
			throw new StatException(CACoreMessages.ERROR_2 + e.getMessage(), e);
119
			throw new StatException(CACoreMessages.error_errorWhileComputingCA + e.getMessage(), e);
120 120
		}
121 121
	}
122 122

  
......
131 131
				colcontrib = sv.asDoubleMatrix();
132 132
				// Arrays.sort(rowdist);
133 133
			} catch (RWorkspaceException e) {
134
				throw new StatException(CACoreMessages.FactoMineRCA_2 + e.getMessage(), e);
134
				throw new StatException(CACoreMessages.error_failedToGetContributionColumn + e.getMessage(), e);
135 135
			} catch (REXPMismatchException e) {
136 136
				// TODO Auto-generated catch block
137 137
				org.txm.utils.logger.Log.printStackTrace(e);
......
151 151
				colcos2 = sv.asDoubleMatrix();
152 152
				// Arrays.sort(rowdist);
153 153
			} catch (RWorkspaceException e) {
154
				throw new StatException(CACoreMessages.FactoMineRCA_3 + e.getMessage(), e);
154
				throw new StatException(CACoreMessages.error_failedToGetCos2Column + e.getMessage(), e);
155 155
			} catch (REXPMismatchException e) {
156 156
				// TODO Auto-generated catch block
157 157
				org.txm.utils.logger.Log.printStackTrace(e);
......
237 237
				colinertia = RWorkspace.toDouble(sv);
238 238
				// Arrays.sort(colinertia);
239 239
			} catch (RWorkspaceException e) {
240
				throw new StatException(CACoreMessages.ERROR_3 + e.getMessage(), e);
240
				throw new StatException(CACoreMessages.error_unableToExtractSingularValues + e.getMessage(), e);
241 241
			}
242 242
		}
243 243
		return colinertia;
......
257 257
				colmass = RWorkspace.toDouble(sv);
258 258
				// Arrays.sort(colmass);
259 259
			} catch (RWorkspaceException e) {
260
				throw new StatException(CACoreMessages.ERROR_3 + e.getMessage(), e);
260
				throw new StatException(CACoreMessages.error_unableToExtractSingularValues + e.getMessage(), e);
261 261
			}
262 262
		}
263 263
		return colmass;
......
278 278
						rowcontrib[i][j] = rowcontrib[i][j] / 100.0; 
279 279
				// Arrays.sort(rowdist);
280 280
			} catch (RWorkspaceException e) {
281
				throw new StatException(CACoreMessages.FactoMineRCA_4 + e.getMessage(), e);
281
				throw new StatException(CACoreMessages.error_failedToGetConstributionRow + e.getMessage(), e);
282 282
			} catch (REXPMismatchException e) {
283 283
				// TODO Auto-generated catch block
284 284
				org.txm.utils.logger.Log.printStackTrace(e);
......
298 298
				rowcos2 = sv.asDoubleMatrix();
299 299
				// Arrays.sort(rowdist);
300 300
			} catch (RWorkspaceException e) {
301
				throw new StatException(CACoreMessages.FactoMineRCA_5 + e.getMessage(), e);
301
				throw new StatException(CACoreMessages.error_failedToGetCos2Row + e.getMessage(), e);
302 302
			} catch (REXPMismatchException e) {
303 303
				// TODO Auto-generated catch block
304 304
				org.txm.utils.logger.Log.printStackTrace(e);
......
370 370
				rowinertia = RWorkspace.toDouble(sv);
371 371
				// Arrays.sort(rowinertia);
372 372
			} catch (RWorkspaceException e) {
373
				throw new StatException(CACoreMessages.ERROR_3 + e.getMessage(), e);
373
				throw new StatException(CACoreMessages.error_unableToExtractSingularValues + e.getMessage(), e);
374 374
			}
375 375
		}
376 376
		return rowinertia;
......
390 390
				rowmass = RWorkspace.toDouble(sv);
391 391
				// Arrays.sort(rowmass);
392 392
			} catch (RWorkspaceException e) {
393
				throw new StatException(CACoreMessages.ERROR_3 + e.getMessage(), e);
393
				throw new StatException(CACoreMessages.error_unableToExtractSingularValues + e.getMessage(), e);
394 394
			}
395 395
		}
396 396
		return rowmass;
......
438 438
					valeursPropres = Arrays.copyOfRange(valeursPropres, 0, valeursPropres.length -1);
439 439
				// Arrays.sort(singularValues);
440 440
			} catch (RWorkspaceException e) {
441
				throw new StatException(CACoreMessages.ERROR_3 + e.getMessage(), e);
441
				throw new StatException(CACoreMessages.error_unableToExtractSingularValues + e.getMessage(), e);
442 442
			}
443 443
		}
444 444
		return valeursPropres;
......
453 453
		try {
454 454
			rw.voidEval("library(FactoMineR)"); //$NON-NLS-1$
455 455
		} catch (RWorkspaceException e) {
456
			System.out.println(CACoreMessages.ERROR_1+ e);
456
			System.out.println(CACoreMessages.error_canNotLoadCALibrary+ e);
457 457
			return false;
458 458
		}
459 459
		return true;
tmp/org.txm.ca.core/src/org/txm/ca/core/statsengine/r/functions/CA.java (revision 327)
107 107
	public CA(ILexicalTable table) throws StatException {
108 108
		
109 109
		if (!rw.containsVariable(table.getSymbol())) {
110
			throw new StatException(CACoreMessages.ERROR_0);
110
			throw new StatException(CACoreMessages.error_lexicalTableNotFoundInWorkspace);
111 111
		}
112 112

  
113 113
		loadLibrary();
......
117 117
			rw.callFunctionAndAffect(
118 118
					"ca", new String[] { table.getSymbol() }, symbol); //$NON-NLS-1$
119 119
		} catch (RWorkspaceException e) {
120
			throw new StatException(CACoreMessages.ERROR_2 + e.getMessage(), e);
120
			throw new StatException(CACoreMessages.error_errorWhileComputingCA + e.getMessage(), e);
121 121
		}
122 122
	}
123 123

  
......
217 217
				coldist = RWorkspace.toDouble(sv);
218 218
				// Arrays.sort(coldist);
219 219
			} catch (RWorkspaceException e) {
220
				throw new StatException(CACoreMessages.ERROR_3 + e.getMessage(), e);
220
				throw new StatException(CACoreMessages.error_unableToExtractSingularValues + e.getMessage(), e);
221 221
			}
222 222
		}
223 223
		return coldist;
......
237 237
				colinertia = RWorkspace.toDouble(sv);
238 238
				// Arrays.sort(colinertia);
239 239
			} catch (RWorkspaceException e) {
240
				throw new StatException(CACoreMessages.ERROR_3 + e.getMessage(), e);
240
				throw new StatException(CACoreMessages.error_unableToExtractSingularValues + e.getMessage(), e);
241 241
			}
242 242
		}
243 243
		return colinertia;
......
257 257
				colmass = RWorkspace.toDouble(sv);
258 258
				// Arrays.sort(colmass);
259 259
			} catch (RWorkspaceException e) {
260
				throw new StatException(CACoreMessages.ERROR_3 + e.getMessage(), e);
260
				throw new StatException(CACoreMessages.error_unableToExtractSingularValues + e.getMessage(), e);
261 261
			}
262 262
		}
263 263
		return colmass;
......
361 361
				rowdist = RWorkspace.toDouble(sv);
362 362
				// Arrays.sort(rowdist);
363 363
			} catch (RWorkspaceException e) {
364
				throw new StatException(CACoreMessages.ERROR_3 + e.getMessage(), e);
364
				throw new StatException(CACoreMessages.error_unableToExtractSingularValues + e.getMessage(), e);
365 365
			}
366 366
		}
367 367
		return rowdist;
......
381 381
				rowinertia = RWorkspace.toDouble(sv);
382 382
				// Arrays.sort(rowinertia);
383 383
			} catch (RWorkspaceException e) {
384
				throw new StatException(CACoreMessages.ERROR_3 + e.getMessage(), e);
384
				throw new StatException(CACoreMessages.error_unableToExtractSingularValues + e.getMessage(), e);
385 385
			}
386 386
		}
387 387
		return rowinertia;
......
401 401
				rowmass = RWorkspace.toDouble(sv);
402 402
				// Arrays.sort(rowmass);
403 403
			} catch (RWorkspaceException e) {
404
				throw new StatException(CACoreMessages.ERROR_3 + e.getMessage(), e);
404
				throw new StatException(CACoreMessages.error_unableToExtractSingularValues + e.getMessage(), e);
405 405
			}
406 406
		}
407 407
		return rowmass;
......
421 421
				singularValues = RWorkspace.toDouble(sv);
422 422
				// Arrays.sort(singularValues);
423 423
			} catch (RWorkspaceException e) {
424
				throw new StatException(CACoreMessages.ERROR_3 + e.getMessage(), e);
424
				throw new StatException(CACoreMessages.error_unableToExtractSingularValues + e.getMessage(), e);
425 425
			}
426 426
		}
427 427
		return singularValues;
......
460 460
		try {
461 461
			rw.voidEval("library(ca)"); //$NON-NLS-1$
462 462
		} catch (RWorkspaceException e) {
463
			System.out.println(CACoreMessages.ERROR_1 + e);
463
			System.out.println(CACoreMessages.error_canNotLoadCALibrary + e);
464 464
			return false;
465 465
		}
466 466
		return true;
tmp/org.txm.ca.core/src/org/txm/ca/core/messages/messages_fr.properties (revision 327)
1 1

  
2
CHARTS_ERROR_CANT_CREATE_CA_FILE_CHART         = Impossible de créer le fichier du graphique du plan factoriel de l'AFC (moteur de production de graphiques: {0})
3
CHARTS_ERROR_CANT_CREATE_SINGULAR_VALUES_CHART = Impossible de créer l'histogramme des valeurs propres de l'AFC
4
CHARTS_FACTORIAL_MAP_AXIS_LABEL_PREFIX         = Axe
5
CHARTS_FACTORIAL_MAP_LEGEND_COLUMNS_LABEL      = Colonnes
6
CHARTS_FACTORIAL_MAP_LEGEND_ROWS_LABEL         = Lignes
7
CHARTS_FACTORIAL_MAP_TITLE                     = Plan factoriel de l'analyse des correspondances\nsur la partition {0} du corpus {1}
8
CHARTS_FACTORIAL_MAP_TOOLTIP_COLS_LABEL        = t
9
CHARTS_FACTORIAL_MAP_TOOLTIP_COORDINATES       = Coordonnées
10
CHARTS_FACTORIAL_MAP_TOOLTIP_ROWS_LABEL        = Fréquence
11
CHARTS_SINGULAR_VALUES_TITLE                   = Valeurs propres
12
CHARTS_SINGULAR_VALUES_TOOLTIP_PERCENT         = %
13
CHARTS_SINGULAR_VALUES_TOOLTIP_SUM             = ∑
14
CHARTS_SINGULAR_VALUES_TOOLTIP_Y_LABEL         = Valeur propre
15
CHARTS_SINGULAR_VALUES_X_AXIS_LABEL            = Axe
16
CHARTS_SINGULAR_VALUES_Y_AXIS_LABEL            = Valeur propre
2
c1 = c1
17 3

  
18
ColumnLabel_C1   = c1
19
ColumnLabel_C2   = c2
20
ColumnLabel_C3   = c3
21
ColumnLabel_COLS = Colonnes
22
ColumnLabel_CONT = Cont
23
ColumnLabel_COS2 = Cos²
24
ColumnLabel_DIST = Dist
25
ColumnLabel_MASS = Mass
26
ColumnLabel_Q12  = Q12
27
ColumnLabel_Q13  = Q13
28
ColumnLabel_Q23  = Q23
29
ColumnLabel_ROWS = Lignes
4
c2 = c2
30 5

  
31
ERROR_0 = ** La table lexicale n'a pas été trouvée dans l'espace de travail R.
32
ERROR_1 = ** Impossible de charger la librairie 'ca'
33
ERROR_2 = ** Erreur lors du calcul de l'analyse factorielle des correspondances : 
34
ERROR_3 = ** Impossible d'extraire les valeurs propres 
6
c3 = c3
35 7

  
36
FactoMineRCA_2 = ** Echec d'accès à la colonne des contributions : 
37
FactoMineRCA_3 = ** Echec d'accès à la colonne des cos² : 
38
FactoMineRCA_4 = ** Echec d'accès à la ligne des contributions : 
39
FactoMineRCA_5 = ** Echec d'accès à la ligne des cos² : 
8
charts_error_factorialMap_cantCreateCAChartFile           = Impossible de créer le fichier du graphique du plan factoriel de l'AFC (moteur de production de graphiques: {0})
9
charts_error_singularValues_cantCreateSingularValuesChart = Impossible de créer l'histogramme des valeurs propres de l'AFC
10
charts_factorialMap_axisLabelPrefix                       = Axe
11
charts_factorialMap_legendColumnsLabel                    = Colonnes
12
charts_factorialMap_legendRowsLabel                       = Lignes
13
charts_factorialMap_title                                 = Plan factoriel de l'analyse des correspondances\nsur la partition {0} du corpus {1}
14
charts_factorialMap_tooltipColsLabel                      = t
15
charts_factorialMap_tooltipCoordinates                    = Coordonnées
16
charts_factorialMap_tooltipRowsLabel                      = Fréquence
17
charts_singularValues_title                               = Valeurs propres
18
charts_singularValues_tooltipPercent                      = %
19
charts_singularValues_tooltipSum                          = ∑
20
charts_singularValues_tooltipYLabel                       = Valeur propre
21
charts_singularValues_xAxisLabel                          = Axe
22
charts_singularValues_yAxisLabel                          = Valeur propre
23

  
24
cols = Colonnes
25

  
26
cont = Cont
27

  
28
cos2 = Cos²
29

  
30
dist = Dist
31

  
32
error_canNotLoadCALibrary             = ** Impossible de charger la librairie 'ca'
33
error_errorWhileComputingCA           = ** Erreur lors du calcul de l'analyse factorielle des correspondances : 
34
error_failedToGetConstributionRow     = ** Echec d'accès à la ligne des contributions : 
35
error_failedToGetContributionColumn   = ** Echec d'accès à la colonne des contributions : 
36
error_failedToGetCos2Column           = ** Echec d'accès à la colonne des cos² : 
37
error_failedToGetCos2Row              = ** Echec d'accès à la ligne des cos² : 
38
error_lexicalTableNotFoundInWorkspace = ** La table lexicale n'a pas été trouvée dans l'espace de travail R.
39
error_unableToExtractSingularValues   = ** Impossible d'extraire les valeurs propres 
40

  
41
mass = Mass
42

  
43
q12 = Q12
44

  
45
q13 = Q13
46

  
47
q23 = Q23
48

  
49
rows = Lignes
tmp/org.txm.ca.core/src/org/txm/ca/core/messages/messages.properties (revision 327)
1 1

  
2
CHARTS_ERROR_CANT_CREATE_CA_FILE_CHART         = Can't create CA chart file (charts engine: {0})
3
CHARTS_ERROR_CANT_CREATE_SINGULAR_VALUES_CHART = Can't create bar chart of the CA singular values
4
CHARTS_FACTORIAL_MAP_AXIS_LABEL_PREFIX         = Axis
5
CHARTS_FACTORIAL_MAP_LEGEND_COLUMNS_LABEL      = Columns
6
CHARTS_FACTORIAL_MAP_LEGEND_ROWS_LABEL         = Rows
7
CHARTS_FACTORIAL_MAP_TITLE                     = Correspondence analysis factorial map\nof the {0} partition in the {1} corpus
8
CHARTS_FACTORIAL_MAP_TOOLTIP_COLS_LABEL        = t
9
CHARTS_FACTORIAL_MAP_TOOLTIP_COORDINATES       = Coordinates
10
CHARTS_FACTORIAL_MAP_TOOLTIP_ROWS_LABEL        = Frequency
11
CHARTS_SINGULAR_VALUES_TITLE                   = Eigenvalues
12
CHARTS_SINGULAR_VALUES_TOOLTIP_PERCENT         = %
13
CHARTS_SINGULAR_VALUES_TOOLTIP_SUM             = ∑
14
CHARTS_SINGULAR_VALUES_TOOLTIP_Y_LABEL         = Eigenvalue
15
CHARTS_SINGULAR_VALUES_X_AXIS_LABEL            = Axis
16
CHARTS_SINGULAR_VALUES_X_LABELS_PREFIX         = 
17
CHARTS_SINGULAR_VALUES_Y_AXIS_LABEL            = Eigenvalue
2
c1 = c1
18 3

  
19
ColumnLabel_C1   = c1
20
ColumnLabel_C2   = c2
21
ColumnLabel_C3   = c3
22
ColumnLabel_COLS = Cols
23
ColumnLabel_CONT = Cont
24
ColumnLabel_COS2 = Cos²
25
ColumnLabel_DIST = Dist
26
ColumnLabel_MASS = Mass
27
ColumnLabel_Q12  = Q12
28
ColumnLabel_Q13  = Q13
29
ColumnLabel_Q23  = Q23
30
ColumnLabel_ROWS = Rows
4
c2 = c2
31 5

  
32
ERROR_0 = ** The lexical table was not found in the R workspace.
33
ERROR_1 = ** Cannot load the 'ca' library
34
ERROR_2 = ** Error while computing correspondence analysis: 
35
ERROR_3 = ** Unable to extract singular values
6
c3 = c3
36 7

  
37
FactoMineRCA_2 = ** Fail to get contrib column: 
38
FactoMineRCA_3 = ** Fail to get cos² column: 
39
FactoMineRCA_4 = ** Fail to get contrib row: 
40
FactoMineRCA_5 = ** Fail to get cos² row: 
8
charts_error_factorialMap_cantCreateCAChartFile           = Can't create CA chart file (charts engine: {0})
9
charts_error_singularValues_cantCreateSingularValuesChart = Can't create bar chart of the CA singular values
10
charts_factorialMap_axisLabelPrefix                       = Axis
11
charts_factorialMap_legendColumnsLabel                    = Columns
12
charts_factorialMap_legendRowsLabel                       = Rows
13
charts_factorialMap_title                                 = Correspondence analysis factorial map\nof the {0} partition in the {1} corpus
14
charts_factorialMap_tooltipColsLabel                      = t
15
charts_factorialMap_tooltipCoordinates                    = Coordinates
16
charts_factorialMap_tooltipRowsLabel                      = Frequency
17
charts_singularValues_title                               = Eigenvalues
18
charts_singularValues_tooltipPercent                      = %
19
charts_singularValues_tooltipSum                          = ∑
20
charts_singularValues_tooltipYLabel                       = Eigenvalue
21
charts_singularValues_xAxisLabel                          = Axis
22
charts_singularValues_yAxisLabel                          = Eigenvalue
23

  
24
cols = Cols
25

  
26
cont = Cont
27

  
28
cos2 = Cos²
29

  
30
dist = Dist
31

  
32
error_canNotLoadCALibrary             = ** Cannot load the 'ca' library
33
error_errorWhileComputingCA           = ** Error while computing correspondence analysis: 
34
error_failedToGetConstributionRow     = ** Failed to get contribution row: 
35
error_failedToGetContributionColumn   = ** Failed to get contribution column: 
36
error_failedToGetCos2Column           = ** Failed to get cos² column: 
37
error_failedToGetCos2Row              = ** Failed to get cos² row: 
38
error_lexicalTableNotFoundInWorkspace = ** The lexical table was not found in the R workspace.
39
error_unableToExtractSingularValues   = ** Unable to extract singular values
40

  
41
mass = Mass
42

  
43
q12 = Q12
44

  
45
q13 = Q13
46

  
47
q23 = Q23
48

  
49
rows = Rows
tmp/org.txm.ca.core/src/org/txm/ca/core/messages/CACoreMessages.java (revision 327)
7 7

  
8 8
	private static final String BUNDLE_NAME = "org.txm.ca.core.messages.messages"; //$NON-NLS-1$
9 9

  
10
	public static String charts_error_factorialMap_cantCreateCAChartFile;
10 11
	
11
	public static String CHARTS_ERROR_CANT_CREATE_CA_FILE_CHART;
12
	public static String charts_error_singularValues_cantCreateSingularValuesChart;
12 13
	
13
	public static String CHARTS_FACTORIAL_MAP_TITLE;
14
	public static String CHARTS_FACTORIAL_MAP_LEGEND_COLUMNS_LABEL;
15
	public static String CHARTS_FACTORIAL_MAP_LEGEND_ROWS_LABEL;
16
	public static String CHARTS_FACTORIAL_MAP_AXIS_LABEL_PREFIX;
17
	public static String CHARTS_FACTORIAL_MAP_TOOLTIP_ROWS_LABEL;
18
	public static String CHARTS_FACTORIAL_MAP_TOOLTIP_COLS_LABEL;
19
	public static String CHARTS_FACTORIAL_MAP_TOOLTIP_COORDINATES;
14
	public static String charts_factorialMap_axisLabelPrefix;
15
	public static String charts_factorialMap_legendColumnsLabel;
16
	public static String charts_factorialMap_legendRowsLabel;
17
	public static String charts_factorialMap_title;
18
	public static String charts_factorialMap_tooltipColsLabel;
19
	public static String charts_factorialMap_tooltipCoordinates;
20
	public static String charts_factorialMap_tooltipRowsLabel;
20 21

  
21
	public static String CHARTS_ERROR_CANT_CREATE_SINGULAR_VALUES_CHART;
22
	public static String CHARTS_SINGULAR_VALUES_TITLE;
23
	public static String CHARTS_SINGULAR_VALUES_X_AXIS_LABEL;
24
	public static String CHARTS_SINGULAR_VALUES_X_LABELS_PREFIX;
25
	public static String CHARTS_SINGULAR_VALUES_Y_AXIS_LABEL;
26
	public static String CHARTS_SINGULAR_VALUES_TOOLTIP_Y_LABEL;
27
	public static String CHARTS_SINGULAR_VALUES_TOOLTIP_PERCENT;
28
	public static String CHARTS_SINGULAR_VALUES_TOOLTIP_SUM;
22
	public static String charts_singularValues_title;
23
	public static String charts_singularValues_tooltipPercent;
24
	public static String charts_singularValues_tooltipSum;
25
	public static String charts_singularValues_tooltipYLabel;
26
	public static String charts_singularValues_xAxisLabel;
27
	public static String charts_singularValues_xLabelsPrefix;
28
	public static String charts_singularValues_yAxisLabel;
29
	
30
	public static String c1;
31
	public static String c2;
32
	public static String c3;
33
	public static String cols;
34
	public static String cont;
35
	public static String cos2;
36
	public static String dist;
37
	public static String mass;
38
	public static String q12;
39
	public static String q13;
40
	public static String q23;
41
	public static String rows;
29 42

  
30
	public static String ColumnLabel_ROWS;
31
	public static String ColumnLabel_COLS;
32
	public static String ColumnLabel_Q12;
33
	public static String ColumnLabel_Q13;
34
	public static String ColumnLabel_Q23;
35
	public static String ColumnLabel_MASS;
36
	public static String ColumnLabel_DIST;
37
	public static String ColumnLabel_CONT;
38
	public static String ColumnLabel_COS2;
39
	public static String ColumnLabel_C1;
40
	public static String ColumnLabel_C2;
41
	public static String ColumnLabel_C3;
42 43
	
43
	public static String ERROR_0;
44
	public static String ERROR_1;
45
	public static String ERROR_2;
46
	public static String ERROR_3;
44
	public static String error_canNotLoadCALibrary;
45
	public static String error_errorWhileComputingCA;
46
	public static String error_failedToGetConstributionRow;
47
	public static String error_failedToGetContributionColumn;
48
	public static String error_failedToGetCos2Column;
49
	public static String error_failedToGetCos2Row;
50
	public static String error_lexicalTableNotFoundInWorkspace;
51
	public static String error_unableToExtractSingularValues;
47 52

  
48
	public static String FactoMineRCA_2;
49
	public static String FactoMineRCA_3;
50
	public static String FactoMineRCA_4;
51
	public static String FactoMineRCA_5;
52

  
53 53
	
54 54
	static {
55 55
		// initialize resource bundle
tmp/org.txm.ca.core/src/org/txm/ca/core/functions/CA.java (revision 327)
415 415
	{
416 416
		if (coltitles == null) {
417 417
			List<String> colnames = new ArrayList<String>();
418
			colnames.add(CACoreMessages.ColumnLabel_COLS); // entry
418
			colnames.add(CACoreMessages.cols); // entry
419 419
			colnames.add(" "); //$NON-NLS-1$
420
			colnames.add(CACoreMessages.ColumnLabel_Q12); // Q12
421
			colnames.add(CACoreMessages.ColumnLabel_Q13); // Q13
422
			colnames.add(CACoreMessages.ColumnLabel_Q23); // Q23
423
			colnames.add(CACoreMessages.ColumnLabel_MASS); // Mass
424
			colnames.add(CACoreMessages.ColumnLabel_DIST); // Dist
420
			colnames.add(CACoreMessages.q12); // Q12
421
			colnames.add(CACoreMessages.q13); // Q13
422
			colnames.add(CACoreMessages.q23); // Q23
423
			colnames.add(CACoreMessages.mass); // Mass
424
			colnames.add(CACoreMessages.dist); // Dist
425 425
			for (int c = 0; c < 3; c++)// seulement les 3 premiers axes
426 426
			{
427 427
				colnames.add(" "); // separator //$NON-NLS-1$
428
				colnames.add(CACoreMessages.ColumnLabel_CONT+ (c + 1)); // ContribN
429
				colnames.add(CACoreMessages.ColumnLabel_COS2+ (c + 1)); // Cos²N
428
				colnames.add(CACoreMessages.cont+ (c + 1)); // ContribN
429
				colnames.add(CACoreMessages.cos2+ (c + 1)); // Cos²N
430 430
			}
431 431
			colnames.add(" "); // separator //$NON-NLS-1$
432
			colnames.add(CACoreMessages.ColumnLabel_C1); // coord axis 1
433
			colnames.add(CACoreMessages.ColumnLabel_C2); // coord axis 2
434
			colnames.add(CACoreMessages.ColumnLabel_C3); // coord axis 3
432
			colnames.add(CACoreMessages.c1); // coord axis 1
433
			colnames.add(CACoreMessages.c2); // coord axis 2
434
			colnames.add(CACoreMessages.c3); // coord axis 3
435 435
			colnames.add(""); //$NON-NLS-1$
436 436

  
437 437
			coltitles = colnames.toArray(new String[] {});
......
615 615
	public String[] getRowInfosTitles() {
616 616
		if (rowtitles == null) {
617 617
			List<String> colnames = new ArrayList<String>();
618
			colnames.add(CACoreMessages.ColumnLabel_ROWS); // entry
618
			colnames.add(CACoreMessages.rows); // entry
619 619
			colnames.add(" "); //$NON-NLS-1$
620
			colnames.add(CACoreMessages.ColumnLabel_Q12); // Q12
621
			colnames.add(CACoreMessages.ColumnLabel_Q13); // Q13
622
			colnames.add(CACoreMessages.ColumnLabel_Q23); // Q23
623
			colnames.add(CACoreMessages.ColumnLabel_MASS); // Mass
624
			colnames.add(CACoreMessages.ColumnLabel_DIST); // Dist
620
			colnames.add(CACoreMessages.q12); // Q12
621
			colnames.add(CACoreMessages.q13); // Q13
622
			colnames.add(CACoreMessages.q23); // Q23
623
			colnames.add(CACoreMessages.mass); // Mass
624
			colnames.add(CACoreMessages.dist); // Dist
625 625
			for (int c = 0; c < 3; c++)// seulement les 3 premiers axes
626 626
			{
627 627
				colnames.add(" "); // separator //$NON-NLS-1$
628
				colnames.add(CACoreMessages.ColumnLabel_CONT+ (c + 1)); // ContribN
629
				colnames.add(CACoreMessages.ColumnLabel_COS2+ (c + 1)); // Cos²N
628
				colnames.add(CACoreMessages.cont+ (c + 1)); // ContribN
629
				colnames.add(CACoreMessages.cos2+ (c + 1)); // Cos²N
630 630
			}
631 631
			colnames.add(" "); // separator //$NON-NLS-1$
632
			colnames.add(CACoreMessages.ColumnLabel_C1); // coord axis 1
633
			colnames.add(CACoreMessages.ColumnLabel_C2); // coord axis 2
634
			colnames.add(CACoreMessages.ColumnLabel_C3); // coord axis 3
632
			colnames.add(CACoreMessages.c1); // coord axis 1
633
			colnames.add(CACoreMessages.c2); // coord axis 2
634
			colnames.add(CACoreMessages.c3); // coord axis 3
635 635
			colnames.add(""); //$NON-NLS-1$
636 636

  
637 637
			rowtitles = colnames.toArray(new String[] {});
tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/base/Utils.java (revision 327)
40 40
			corpusName = ca.getCorpus().getSimpleName();
41 41
		}
42 42

  
43
		return ChartsEngineCoreMessages.bind(CACoreMessages.CHARTS_FACTORIAL_MAP_TITLE, partitionName, corpusName);
43
		return ChartsEngineCoreMessages.bind(CACoreMessages.charts_factorialMap_title, partitionName, corpusName);
44 44
	}
45 45

  
46 46
	/**
tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/datasets/FCAXYDataset.java (revision 327)
245 245
	public Comparable getSeriesKey(int series) {
246 246
		// Rows
247 247
		if(series == 0) {
248
			return CACoreMessages.CHARTS_FACTORIAL_MAP_LEGEND_ROWS_LABEL;
248
			return CACoreMessages.charts_factorialMap_legendRowsLabel;
249 249
		}
250 250
		// Cols
251 251
		else {
252
			return CACoreMessages.CHARTS_FACTORIAL_MAP_LEGEND_COLUMNS_LABEL;
252
			return CACoreMessages.charts_factorialMap_legendColumnsLabel;
253 253
		}
254 254
	}
255 255

  
tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCSingularValueChartCreator.java (revision 327)
42 42
			double[] singularValues = ca.getValeursPropres();
43 43

  
44 44
			for(int i = 0; i < singularValues.length; i++) {
45
				dataset.setValue(singularValues[i], CACoreMessages.CHARTS_SINGULAR_VALUES_TOOLTIP_Y_LABEL, CACoreMessages.CHARTS_SINGULAR_VALUES_X_LABELS_PREFIX + String.valueOf(i + 1));
45
				dataset.setValue(singularValues[i], CACoreMessages.charts_singularValues_tooltipYLabel, CACoreMessages.charts_singularValues_xLabelsPrefix + String.valueOf(i + 1));
46 46
			}
47 47

  
48 48
			// Create the chart
49
			chart = this.getChartsEngine().createCategoryBarChart(dataset, CACoreMessages.CHARTS_SINGULAR_VALUES_TITLE, CACoreMessages.CHARTS_SINGULAR_VALUES_X_AXIS_LABEL, CACoreMessages.CHARTS_SINGULAR_VALUES_Y_AXIS_LABEL, false, false, false);
49
			chart = this.getChartsEngine().createCategoryBarChart(dataset, CACoreMessages.charts_singularValues_title, CACoreMessages.charts_singularValues_xAxisLabel, CACoreMessages.charts_singularValues_yAxisLabel, false, false, false);
50 50

  
51 51
			// Custom renderer
52 52
			chart.getCategoryPlot().setRenderer(new CASingularValuesItemSelectionRenderer(ca));
......
57 57

  
58 58
		}
59 59
		catch(StatException e) {
60
			Log.severe(CACoreMessages.CHARTS_ERROR_CANT_CREATE_SINGULAR_VALUES_CHART + e);
60
			Log.severe(CACoreMessages.charts_error_singularValues_cantCreateSingularValuesChart + e);
61 61
		}
62 62

  
63 63

  
tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCCAChartCreator.java (revision 327)
343 343
		 try {
344 344
			 double sinuglarValuesSum = ca.getValeursPropresSum();
345 345
			 DecimalFormat f = new DecimalFormat("###.00"); //$NON-NLS-1$
346
			 ((JFreeChart) chart).getXYPlot().getDomainAxis().setLabel(CACoreMessages.CHARTS_FACTORIAL_MAP_AXIS_LABEL_PREFIX + " " + dimension1 + " (" + f.format(100 * ca.getValeursPropres()[dimension1 - 1] / sinuglarValuesSum) + "%)");
347
			 ((JFreeChart) chart).getXYPlot().getRangeAxis().setLabel(CACoreMessages.CHARTS_FACTORIAL_MAP_AXIS_LABEL_PREFIX + " " + dimension2 + " (" + f.format(100 * ca.getValeursPropres()[dimension2 - 1] / sinuglarValuesSum) + "%)");
346
			 ((JFreeChart) chart).getXYPlot().getDomainAxis().setLabel(CACoreMessages.charts_factorialMap_axisLabelPrefix + " " + dimension1 + " (" + f.format(100 * ca.getValeursPropres()[dimension1 - 1] / sinuglarValuesSum) + "%)");
347
			 ((JFreeChart) chart).getXYPlot().getRangeAxis().setLabel(CACoreMessages.charts_factorialMap_axisLabelPrefix + " " + dimension2 + " (" + f.format(100 * ca.getValeursPropres()[dimension2 - 1] / sinuglarValuesSum) + "%)");
348 348

  
349 349
			 // Refresh data set
350 350
			 // FIXME : any way to fire a data set event rather than reassign the same data set?
tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CASingularValuesItemSelectionRenderer.java (revision 327)
64 64
				List<List<Object>> singularValuesData = ca.getSingularValuesInfos();
65 65

  
66 66
				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p>#" + catDataset.getColumnKey(column) + "</p>"
67
						+ "<p><span style=\"color: " + hex + ";\">" + catDataset.getRowKey(row) + ChartsEngineCoreMessages.CHARTS_LABEL_VALUE_SEPARATORS
67
						+ "<p><span style=\"color: " + hex + ";\">" + catDataset.getRowKey(row) + ChartsEngineCoreMessages.charts_labelValueSeparator
68 68
							+ " </span><b>" + valuesNumberFormat.format(value) + "</b></p>"
69
						+ "<p><span style=\"color: " + hex + ";\">" + CACoreMessages.CHARTS_SINGULAR_VALUES_TOOLTIP_PERCENT + ChartsEngineCoreMessages.CHARTS_LABEL_VALUE_SEPARATORS
69
						+ "<p><span style=\"color: " + hex + ";\">" + CACoreMessages.charts_singularValues_tooltipPercent + ChartsEngineCoreMessages.charts_labelValueSeparator
70 70
							+ " </span><b>" + percentValuesNumberFormat.format(singularValuesData.get(column).get(2)) + "</b></p>"
71
						+ "<p><span style=\"color: " + hex + ";\">" + CACoreMessages.CHARTS_SINGULAR_VALUES_TOOLTIP_SUM + CACoreMessages.CHARTS_SINGULAR_VALUES_TOOLTIP_PERCENT
72
							+ ChartsEngineCoreMessages.CHARTS_LABEL_VALUE_SEPARATORS
71
						+ "<p><span style=\"color: " + hex + ";\">" + CACoreMessages.charts_singularValues_tooltipSum + CACoreMessages.charts_singularValues_tooltipPercent
72
							+ ChartsEngineCoreMessages.charts_labelValueSeparator
73 73
							+ " </span><b>" + percentValuesNumberFormat.format(singularValuesData.get(column).get(3)) + "</b></p>"
74 74
						+ "</body><html>";
75 75
			}
tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/FCAItemSelectionRenderer.java (revision 327)
73 73

  
74 74
				FCAXYDataset caDataset = (FCAXYDataset) dataset;
75 75
				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p style=\"color: " + hex + "\"><b>" + caDataset.getLabel(series, item) + "</b></p><p>"
76
						+ CACoreMessages.CHARTS_FACTORIAL_MAP_TOOLTIP_ROWS_LABEL + ChartsEngineCoreMessages.CHARTS_LABEL_VALUE_SEPARATORS + " <b>" + caDataset.getFrequency(series, item).replace("-", "") + "</b></p>"
77
				+ "<p>" +  CACoreMessages.CHARTS_FACTORIAL_MAP_TOOLTIP_COORDINATES + ChartsEngineCoreMessages.CHARTS_LABEL_VALUE_SEPARATORS + " <b>[" + format.format(caDataset.getX(series, item)) + ":" + format.format(caDataset.getY(series, item)) + "]</b></p></body><html>";
76
						+ CACoreMessages.charts_factorialMap_tooltipRowsLabel + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>" + caDataset.getFrequency(series, item).replace("-", "") + "</b></p>"
77
				+ "<p>" +  CACoreMessages.charts_factorialMap_tooltipCoordinates + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>[" + format.format(caDataset.getX(series, item)) + ":" + format.format(caDataset.getY(series, item)) + "]</b></p></body><html>";
78 78
			}
79 79
		});
80 80

  
......
96 96
				// FIXME: to disable tool tip we can return null here or in other renderers generateToolTip methods
97 97
//				return null;
98 98
				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p style=\"color: " + hex + "\"><b>" + caDataset.getLabel(series, item) + "</b></p><p>"
99
					+ CACoreMessages.CHARTS_FACTORIAL_MAP_TOOLTIP_COLS_LABEL + ChartsEngineCoreMessages.CHARTS_LABEL_VALUE_SEPARATORS + " <b>" + caDataset.getFrequency(series, item).replace("-", "") + "</b></p>"
100
				+ "<p>" + CACoreMessages.CHARTS_FACTORIAL_MAP_TOOLTIP_COORDINATES + ChartsEngineCoreMessages.CHARTS_LABEL_VALUE_SEPARATORS + " <b>[" + format.format(caDataset.getX(series, item)) + ":" + format.format(caDataset.getY(series, item)) + "]</b></p></body><html>";
99
					+ CACoreMessages.charts_factorialMap_tooltipColsLabel + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>" + caDataset.getFrequency(series, item).replace("-", "") + "</b></p>"
100
				+ "<p>" + CACoreMessages.charts_factorialMap_tooltipCoordinates + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>[" + format.format(caDataset.getX(series, item)) + ":" + format.format(caDataset.getY(series, item)) + "]</b></p></body><html>";
101 101
			}
102 102
		});
103 103

  
tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RCAChartCreator.java (revision 327)
73 73
			
74 74
		}
75 75
		catch(Exception e) {
76
			Log.severe(CACoreMessages.bind(CACoreMessages.CHARTS_ERROR_CANT_CREATE_CA_FILE_CHART + " - FactoMineR package", RChartsEngine.DESCRIPTION) + e); //$NON-NLS-1$
76
			Log.severe(CACoreMessages.bind(CACoreMessages.charts_error_factorialMap_cantCreateCAChartFile + " - FactoMineR package", RChartsEngine.DESCRIPTION) + e); //$NON-NLS-1$
77 77
		}
78 78

  
79 79
		return destFile;
......
116 116
			this.getChartsEngine().plot(destFile, cmd);
117 117
		}
118 118
		catch(Exception e) {
119
			Log.severe(CACoreMessages.bind(CACoreMessages.CHARTS_ERROR_CANT_CREATE_CA_FILE_CHART + " - CA package", RChartsEngine.DESCRIPTION) + e); //$NON-NLS-1$
119
			Log.severe(CACoreMessages.bind(CACoreMessages.charts_error_factorialMap_cantCreateCAChartFile + " - CA package", RChartsEngine.DESCRIPTION) + e); //$NON-NLS-1$
120 120
		}
121 121

  
122 122
		return destFile;
tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RSingularValuesChartCreator.java (revision 327)
66 66
			if(i > 0)	 {
67 67
				xLabels.append(", "); //$NON-NLS-1$
68 68
			}
69
			xLabels.append("\"" + CACoreMessages.CHARTS_SINGULAR_VALUES_X_LABELS_PREFIX + (i + 1) + "\""); //$NON-NLS-1$ //$NON-NLS-2$
69
			xLabels.append("\"" + CACoreMessages.charts_singularValues_xLabelsPrefix + (i + 1) + "\""); //$NON-NLS-1$ //$NON-NLS-2$
70 70
		}
71 71
		xLabels.append(")"); //$NON-NLS-1$
72 72

  
73 73
		String cmd = "tmpY <- " + ca.getSymbol() + "$eig$eigenvalue[1:length(" + ca.getSymbol() + "$eig$eigenvalue) - 1];\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
74 74
		cmd += "barplot(tmpY, main=\"" //$NON-NLS-1$
75
				+ CACoreMessages.CHARTS_SINGULAR_VALUES_TITLE + "\", ylab=\"" + //$NON-NLS-1$
76
				CACoreMessages.CHARTS_SINGULAR_VALUES_Y_AXIS_LABEL + "\", xlab=\"" + //$NON-NLS-1$
77
				CACoreMessages.CHARTS_SINGULAR_VALUES_X_AXIS_LABEL + "\", names.arg=" + xLabels + ");\n"; //$NON-NLS-1$ //$NON-NLS-2$
75
				+ CACoreMessages.charts_singularValues_title + "\", ylab=\"" + //$NON-NLS-1$
76
				CACoreMessages.charts_singularValues_yAxisLabel + "\", xlab=\"" + //$NON-NLS-1$
77
				CACoreMessages.charts_singularValues_xAxisLabel + "\", names.arg=" + xLabels + ");\n"; //$NON-NLS-1$ //$NON-NLS-2$
78 78

  
79 79
		this.getChartsEngine().plot(file, cmd);
80 80

  

Formats disponibles : Unified diff