/ - Diff - Plateforme TXM - Forge du Centre Blaise Pascal

Révision 3144

     			if (!this.getResult().isDirty()) {
     				// units
     				String[] typeNames = this.getResult().getTypeNames();
     				// units' total freq
     				int[] typeFreq = this.getResult().getFormFrequencies();
     				// units' index for each part
     				double[][] specIndex = this.getResult().getSpecificitesIndex();
     				String[] typeNames = this.getResult().getTypeNames(); // units
     				int[] typeFreq = this.getResult().getFormFrequencies(); // units' total freq
     				double[][] specIndex = this.getResult().getSpecificitesIndex(); // units' index for each part
     				int[][] specFreqs = this.getResult().getFrequencies();
     				// units' total in parts

     		this.frequencies = null;
     		// delete the specificities selection chart children since they can not be valid
     		// anymore if the unit property has changed
     		// delete the specificities selection chart children since they can not be valid anymore if the unit property has changed
     		// FIXME: doesn't work
     		if (this.lexicalTable.hasParameterChanged(TBXPreferences.UNIT_PROPERTY)) {
     			this.deleteChildren(SpecificitiesSelection.class);
+    		}
     //		if (this.lexicalTable.hasParameterChanged(TBXPreferences.UNIT_PROPERTY)) {
     //			this.deleteChildren(SpecificitiesSelection.class);
     //		}
     		ILexicalTable data = this.lexicalTable.getData();
     		SpecificitiesR rSpecificities = new SpecificitiesR(data);
     		double[][] specIndex = rSpecificities.getScores();
     		// TODO if test no more necessary ? only if lexicalTable symb
     		// if (this.lexicalTable.getPartition() != null) {
     		// init(symbol, specIndex);
     		// }
     		// else {
     		init(rSpecificities.getSymbol(), specIndex);
     		this.symbol = rSpecificities.getSymbol();
     		// }
     		// }
     		return true;
+    	}
-...
     				RWorkspace.getRWorkspaceInstance().removeVariableFromWorkspace(this.symbol);
+    			}
     			catch (RWorkspaceException e) {
     				e.printStackTrace();
     				Log.printStackTrace();
+    			}
+    		}
     		this.symbol = symbol;
-...
     			MIN = -maxScore;
+    		}
     		// fixing max and min score values
     		for (int i = 0; i < indices.length; i++) {
     			for (int j = 0; j < indices[i].length; j++) {
     				if (indices[i][j] > MAX) {

     	 * Fusion rows.
+    	 *
     	 * @param row the row
     	 * @throws RWorkspaceException
     	 * @throws StatException
     	 */
     	public boolean mergeCols(int[] cols) throws RWorkspaceException {
     	public boolean mergeCols(int[] cols) throws StatException {
     		if (cols.length < 2) return false;
     		Arrays.sort(cols);
     		// System.out.println("fusion rows: "+Arrays.toString(rows)); //$NON-NLS-1$
-...
+    	 *
     	 * @param col the col
     	 * @param checkEmptyLines the check empty lines
     	 * @throws StatException
     	 */
     	public void removeCol(int col, boolean checkEmptyLines) {
     	public void removeCol(int col, boolean checkEmptyLines) throws StatException {
     		// System.out.println("rmv col " + col);
     		try {
     			removeCol(col);
     			// we remove the empty lineslines
     			if (checkEmptyLines) {
     				removeEmptyRows();
+    			}
+    		}
     		catch (RWorkspaceException e) {
     			Log.printStackTrace(e);
+    		}
+    	}
     	/**
     	 * Removes the cols.
+    	 *
     	 * @param cols the cols
     	 * @throws StatException
     	 */
     	public void removeCols(int[] cols) {
     	public void removeCols(int[] cols) throws StatException {
     		Arrays.sort(cols);
     		int index = 0;
     		for (int i = cols.length - 1; i >= 0; i--) {
-...
+    		}
+    	}
     	public void removeCols(int[] cols, boolean removeEmptyLines) throws RWorkspaceException {
     	public void removeCols(int[] cols, boolean removeEmptyLines) throws StatException {
     		removeCols(cols);
     		if (removeEmptyLines) {
     			removeEmptyRows();
-...
     	 * Removes the cols.
+    	 *
     	 * @param cols the cols
     	 * @throws StatException
     	 */
     	public void removeCols(List<Integer> cols) {
     	public void removeCols(List<Integer> cols) throws StatException {
     		Collections.sort(cols);
     		int index = 0;
     		for (int i = cols.size() - 1; i >= 0; i--) {
     			index = cols.get(i);
     			removeCol(index, false);
+    		}
     		removeEmptyRows();
+    	}
     	public void removeCols(List<Integer> cols, boolean removeEmptyLines) throws RWorkspaceException {
     		removeCols(cols);
     		if (removeEmptyLines) {
     			removeEmptyRows();
+    		}
+    	}
     //	public void removeCols(List<Integer> cols, boolean removeEmptyLines) throws RWorkspaceException {
     //		removeCols(cols);
     //		if (removeEmptyLines) {
     //			removeEmptyRows();
     //		}
     //	}
     	private void removeEmptyCols() throws RWorkspaceException {
     	private void removeEmptyCols() throws StatException {
     		try {
     			int[] colsums = rw.eval("apply(" + symbol + ",2,sum)").asIntegers();// get a vector of line sums //$NON-NLS-1$ //$NON-NLS-2$
     			ArrayList<Integer> removecols = new ArrayList<>();
-...
     	/**
     	 * Removes the empty lines.
+    	 *
     	 * @throws RWorkspaceException the r workspace exception
     	 * @throws StatException
     	 */
     	public void removeEmptyRows() throws RWorkspaceException {
     		try {
     			int[] rowsums = rw.eval("apply(" + symbol + ",1,sum)").asIntegers();// get a vector of line sums //$NON-NLS-1$ //$NON-NLS-2$
     	public void removeEmptyRows() throws StatException {
     			int[] rowsums = this.getRowMargins();
     			ArrayList<Integer> rowIndexes = new ArrayList<>();
     			// get the empty line index
     			for (int i = 0; i < rowsums.length; i++) {
-...
     			if (rowIndexes.size() > 0) {
     				removeRows(rowIndexes);
+    			}
+    		}
     		catch (REXPMismatchException e) {
     			Log.printStackTrace(e);
+    		}
+    	}
     	/**
-...
+    		}
+    	}
     	public void removeRows(int[] rows, boolean removeEmptyCols) throws RWorkspaceException {
     	public void removeRows(int[] rows, boolean removeEmptyCols) throws StatException {
     		removeRows(rows);
     		if (removeEmptyCols) {
     			removeEmptyCols();
-...
+    		}
+    	}
     	public void removeRows(List<Integer> rows, boolean removeEmptyCols) throws RWorkspaceException {
     	public void removeRows(List<Integer> rows, boolean removeEmptyCols) throws StatException {
     		this.removeRows(rows);
     		if (removeEmptyCols) {
     			removeEmptyCols();

Formats disponibles : Unified diff

Laboratoire ICAR » Plateforme TXM

Révision 3144