Revision 555

tmp/org.txm.ca.core/src/org/txm/ca/core/functions/CA.java (revision 555)
128 128

  
129 129
	@Override
130 130
	protected boolean _compute(boolean update) throws Exception {
131
		
132
		// compute the lexical table
133
		this.getParent().compute(update);
134

  
135
		
131 136
		if (useFactoMineR) {
132 137
			ca = new FactoMineRCA(this.getLexicalTable().getData());
133 138
		}
tmp/org.txm.ca.core/src/org/txm/ca/core/functions/Eigenvalues.java (revision 555)
89 89
		return true;
90 90
	}
91 91

  
92
	@Override
93
	public boolean loadParameters() {
94
		// TODO Auto-generated method stub
95
		System.err.println("Eigenvalues.loadParameters(): not yet implemented.");
96
		return true;
97
	}
98

  
92 99
	
93 100

  
94 101
	/* (non-Javadoc)
tmp/org.txm.cah.rcp/src/org/txm/cah/rcp/handlers/ComputeAHC.java (revision 555)
116 116
			Partition partition = (Partition)selection;
117 117
			try {
118 118
				String title = AHCUIMessages.bind(AHCUIMessages.ComputeCAH_0, partition.getName());
119
				int vmax = TXMPreferences.getInt(CAPreferences.V_MAX, CAPreferences.PREFERENCES_NODE);
120
				int fmin = TXMPreferences.getInt(CAPreferences.F_MIN, CAPreferences.PREFERENCES_NODE);
119
				int vMax = TXMPreferences.getInt(CAPreferences.V_MAX, CAPreferences.PREFERENCES_NODE);
120
				int fMin = TXMPreferences.getInt(CAPreferences.F_MIN, CAPreferences.PREFERENCES_NODE);
121 121
				Shell shell = Display.getCurrent().getActiveShell();
122 122
				LexicalTableDialog d = new LexicalTableDialog(shell, partition.getCorpus(), title);
123
				d.setFminAndVMax(fmin, vmax);
123
				d.setFminAndVMax(fMin, vMax);
124 124
				
125 125
				if (d.open() == Window.OK) {
126 126
					Property property = d.getProperty();
127
					fmin = d.getFmin();
128
					vmax = d.getMaxLines();
127
					fMin = d.getFmin();
128
					vMax = d.getMaxLines();
129 129
					
130
					LexicalTable lexicaltable = LexicalTableFactory.getLexicalTable(partition, property, fmin); // use the CAPreferencePage Fmin
131
					lexicaltable.getData().cut(vmax);
130
//					LexicalTable lexicaltable = LexicalTableFactory.getLexicalTable(partition, property, fMin); // use the CAPreferencePage Fmin
131
					
132
					LexicalTable lexicaltable = new LexicalTable(partition, property, fMin, vMax); // use the CAPreferencePage Fmin
133
					
134
					
135
					lexicaltable.getData().cut(vMax);
132 136
					partition.addChild(lexicaltable);
133 137
					
134 138
					ahc = new AHC(new CA(lexicaltable));
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/SVGGraphicEditor.java (revision 555)
244 244
		svgComp.resetZoom();
245 245
	}
246 246

  
247
	@Override
248
	public void updateResultFromEditor() {
249
		// TODO Auto-generated method stub
250
		System.err.println("SVGGraphicEditor.updateResultFromEditor(): not yet implemented.");
251
	}
247 252

  
253

  
248 254
}
tmp/org.txm.internalview.core/src/org/txm/functions/internal/InternalView.java (revision 555)
266 266
		dirty = true;
267 267
	}
268 268

  
269
	
269 270
	@Override
271
	public boolean loadParameters() {
272
		// TODO Auto-generated method stub
273
		System.err.println("InternalView.loadParameters(): not yet implemented.");
274
		return true;
275
	}
276

  
277
	
278
	@Override
270 279
	public boolean setParameters(TXMParameters parameters) {
271 280
		return false;
272 281
	}
tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java (revision 555)
79 79
		this.setDirty();
80 80
		this.setChartDirty();
81 81
	}
82

  
83
	@Override
84
	public boolean loadParameters() {
85
		// TODO Auto-generated method stub
86
		System.err.println("PartitionDimensions.loadParameters(): not yet implemented.");
87
		return true;
88
	}
89

  
82 90
	
83 91
	/**
84 92
	 * Convenience method.
tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java (revision 555)
170 170
		return true;
171 171
	}
172 172

  
173
	@Override
174
	public boolean loadParameters() {
175
		// TODO Auto-generated method stub
176
		System.err.println("Progression.loadParameters(): not yet implemented.");
177
		return true;
178
	}
179

  
173 180
	
174 181
	/**
175 182
	 * 
tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/IndexToLexicalTable.java (revision 555)
117 117
		}
118 118
		
119 119
		try {
120
			table = new LexicalTable(voc, QuantitativeDataStructureImpl
121
					.createSymbole(LexicalTableImpl.class));
120
			table = new LexicalTable(voc, QuantitativeDataStructureImpl.createSymbole(LexicalTableImpl.class));
122 121
		} catch (RWorkspaceException e) {
123 122
			// TODO Auto-generated catch block
124 123
			org.txm.rcp.utils.Logger.printStackTrace(e);
tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/ConcordanceToIndex.java (revision 555)
88 88
					.openEditor(editorInput,
89 89
							"org.txm.rcp.editors.index.IndexEditor"); //$NON-NLS-1$
90 90
			voceditor.setFocus(query);
91
			voceditor.computeResult();
91
			voceditor.compute(false);
92 92
		} catch (PartInitException e) {
93 93
			System.err.println("Error: "+e.getLocalizedMessage());
94 94
		}
tmp/org.txm.textsbalance.core/src/org/txm/textsbalance/core/functions/TextsBalance.java (revision 555)
61 61
	}
62 62

  
63 63
	
64
	
65
	public void loadParameters() {
64
	@Override
65
	public boolean loadParameters() {
66 66
		// TODO Auto-generated method stub
67 67
		try {
68 68
			StructuralUnit su = this.getCorpus().getStructuralUnit(this.getStringParameterValue(TextsBalancePreferences.STRUCTURAL_UNIT));
......
72 72
		catch(CqiClientException e) {
73 73
			// TODO Auto-generated catch block
74 74
			e.printStackTrace();
75
			return false;
75 76
		}
77
		return true;
76 78
	}
77 79

  
78 80
	/**
tmp/org.txm.searchengine.cqp.core/src/org/txm/functions/selection/Selection.java (revision 555)
507 507
		return true;
508 508
	}
509 509

  
510
	@Override
511
	public boolean loadParameters() {
512
		// TODO Auto-generated method stub
513
		System.err.println("Selection.loadParameters(): not yet implemented.");
514
		return true;
515
	}
516

  
510 517
	
511
	
512 518
	@Override
513 519
	protected boolean _compute(boolean update) throws Exception {
514 520
		System.err.println("Selection.compute() not implemented");
tmp/org.txm.searchengine.cqp.core/src/org/txm/functions/summary/Summary.java (revision 555)
278 278
		return true;
279 279
	}
280 280

  
281
	@Override
282
	public boolean loadParameters() {
283
		// TODO Auto-generated method stub
284
		System.err.println("Summary.loadParameters(): not yet implemented.");
285
		return true;
286
	}
287

  
281 288
	
282 289
	@Override
283 290
	protected boolean _compute(boolean update) throws Exception {
tmp/org.txm.searchengine.cqp.core/src/org/txm/functions/preview/Preview.java (revision 555)
105 105
		return true;
106 106
	}
107 107

  
108
	@Override
109
	public boolean loadParameters() {
110
		// TODO Auto-generated method stub
111
		System.err.println("Preview.loadParameters(): not yet implemented.");
112
		return true;
113
	}
114

  
108 115
	
109 116
	@Override
110 117
	protected boolean _compute(boolean update) throws Exception {
tmp/org.txm.searchengine.cqp.core/src/org/txm/functions/diagnostic/Diagnostic.java (revision 555)
626 626

  
627 627
	@Override
628 628
	protected boolean _compute(boolean update) throws Exception {
629
		if (monitor != null) monitor.beginTask("Computing informations...", 3);
629
		
630
		this.beginTask("Computing informations...", 3);
630 631
		stepGeneralInfos();
631
		if (monitor != null) monitor.worked(1);
632
		this.worked(1);
633
		
632 634
		stepLexicalProperties();
633
		if (monitor != null) monitor.worked(1);
635
		this.worked(1);
636
		
634 637
		stepStructuralUnits();
635
		if (monitor != null) monitor.worked(1);
638
		this.worked(1);
636 639
		
637 640
		String txmhome = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE);
638 641
		String filename = corpus.getParent().getName()+"-"+corpus.getName(); //$NON-NLS-1$
639 642
		filename = AsciiUtils.buildId(filename);
640
		diagfile = new File(
641
				txmhome, "results/" + filename + "-infos.html"); //$NON-NLS-1$ //$NON-NLS-2$
643
		diagfile = new File(txmhome, "results/" + filename + "-infos.html"); //$NON-NLS-1$ //$NON-NLS-2$
642 644
		
643
		toHTML(diagfile);
645
		this.toHTML(diagfile);
644 646
		
645 647
		dirty = false;
646 648
		return true;
......
670 672
		return true;
671 673
	}
672 674

  
675
	@Override
676
	public boolean loadParameters() {
677
		// TODO Auto-generated method stub
678
		System.err.println("Diagnostic.loadParameters(): not yet implemented.");
679
		return true;
680
	}
673 681
	
674 682
	
675 683
}
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/handlers/ComputeCA.java (revision 555)
112 112

  
113 113
					Log.info(NLS.bind(CAUIMessages.ComputeCorrespondanceAnalysis_0, partition, property));
114 114

  
115
					LexicalTable lexicalTable = LexicalTableFactory.getLexicalTable(partition, property, fMin);
115
					//LexicalTable lexicalTable = LexicalTableFactory.getLexicalTable(partition, property, fMin);
116
					LexicalTable lexicalTable = new LexicalTable(partition, property, fMin, vMax);
116 117
					ca = new CA(lexicalTable);
117 118
				}
118 119
				// aborted
tmp/org.txm.referencer.core/src/org/txm/functions/referencer/Referencer.java (revision 555)
537 537
	@Override
538 538
	public boolean saveParameters() {
539 539
		// TODO Auto-generated method stub
540
		System.err.println("Reference.saveParameters(): not yet implemented.");
540
		System.err.println("Referencer.saveParameters(): not yet implemented.");
541 541
		return true;
542 542
	}
543 543

  
544 544
	
545
	@Override
546
	public boolean loadParameters() {
547
		// TODO Auto-generated method stub
548
		System.err.println("Referencer.loadParameters(): not yet implemented.");
549
		return true;
550
	}
551

  
552
	
545 553
	/**
546 554
	 * The Class Line.
547 555
	 */
tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/Specificities.java (revision 555)
113 113
	/**
114 114
	 * Specificities.
115 115
	 *
116
	 * @param table the table
116
	 * @param lexicalTable the table
117 117
	 * @return the specificities result
118 118
	 * @throws CqiClientException the cqi client exception
119 119
	 * @throws StatException the stat exception
120 120
	 */
121
	public Specificities(LexicalTable table, int maxScore)	throws CqiClientException, StatException {
122
		super(table);
123
		this.lexicalTable = table;
121
	public Specificities(LexicalTable lexicalTable, int maxScore)	throws CqiClientException, StatException {
122
		super(lexicalTable);
123
		this.lexicalTable = lexicalTable;
124 124
		this.pMaxScore = maxScore;
125 125
	}
126 126

  
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/MergeLines.java (revision 555)
119 119

  
120 120
		LTeditor.refreshTable();
121 121
		lineTableViewer.getTable().deselectAll();
122
		LTeditor.refresh();
122
		LTeditor.refresh(false);
123 123
		StatusLine.setMessage(""); //$NON-NLS-1$
124 124
	}
125 125
}
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/DeleteLines.java (revision 555)
91 91

  
92 92
		LTeditor.refreshTable();
93 93
		LTeditor.getlineTableViewer().getTable().deselectAll();
94
		LTeditor.refresh();
94
		LTeditor.refresh(false);
95 95
	}
96 96

  
97 97
}
tmp/org.txm.cah.core/src/org/txm/cah/core/functions/AHC.java (revision 555)
221 221
	protected boolean _compute(boolean update)	{
222 222

  
223 223
		this.loadParameters();
224

  
225

  
226

  
224 227
		
225 228
		Log.info("Computing CAH...");
226 229
		try {
230
			
231
			// compute the lexical table
232
			this.table.compute(update);
233
			
234
			
227 235
			RWorkspace rw = RWorkspace.getRWorkspaceInstance();
228 236

  
229 237
			String colOrLine = "columns"; //$NON-NLS-1$
......
243 251
					", metric=\""+pMetric+"\"" + //$NON-NLS-1$ //$NON-NLS-2$
244 252
					", method=\""+pMethod+"\"" + //$NON-NLS-1$ //$NON-NLS-2$
245 253
					", graph=FALSE)"); //$NON-NLS-1$
246
		} catch(RWorkspaceException e) {
254
		} catch(Exception e) {
247 255
			System.out.println("Failed to compute CAH: "+e);
248 256
			Log.printStackTrace(e);
249 257
			return false;
tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java (revision 555)
295 295
		return true;
296 296
	}
297 297

  
298
	@Override
299
	public boolean loadParameters() {
300
		// TODO Auto-generated method stub
301
		System.err.println("Index.loadParameters(): not yet implemented.");
302
		return true;
303
	}
304

  
298 305
	
299 306
	@Override
300 307
	public void clean() {

Also available in: Unified diff