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

tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java (revision 1760)
185	185	}
186	186	}
187	187
188
189
190	188	/* (non-Javadoc)
191	189	* @see org.eclipse.jface.preference.FieldEditorPreferencePage#performOk()
192	190	*/
...	...
199	197	RWorkspace rw = RWorkspace.getRWorkspaceInstance();
200	198	if (rw != null) {
201	199	RWorkspace.setUseFileCommunication(RPreferences.getInstance().getBoolean(RPreferences.FILE_TRANSFERT));
	200	rw.setLog(RWorkspace.isLoggingEvalCommandLines());
202	201	}
203	202	} catch (Exception e) {
204	203	System.err.println(NLS.bind(TXMUIMessages.failedToSavePreferencesColonP0, e));

     			Log.fine(RCoreMessages.bind(RCoreMessages.info_connectingToRAt, host, port));
     			connection = new RConnection(host, port);
     			connection.setStringEncoding("utf8"); // mandatory !
     			return isConnected();
     		} catch (RserveException x) {
     			throw new RWorkspaceException(x);
-...
+    	}
     	/**
     	 * Default initialisation of RWorkspace with defautl parameters :
     	 * Default initialisation of RWorkspace with default parameters :
     	 * address = 127.0.0.1
     	 * port = 6311
     	 * debug = false.
+    	 *
     	 * @param pathToRExecutalbe the path to r executalbe
     	 * @param pathToRExecutalbe the path to r executable
     	 * @throws RWorkspaceException the r workspace exception
     	 */
     	public static final void initializeRWorkspace(String pathToRExecutalbe)
     			throws RWorkspaceException {
     		workspace = new RWorkspace(pathToRExecutalbe, "127.0.0.1", 6311, false); //$NON-NLS-1$
     		initializeRWorkspace(pathToRExecutalbe, "127.0.0.1", 6311); //$NON-NLS-1$
+    	}
     	/**
     	 * Initialize r workspace.
     	 * debug = false
+    	 *
     	 * @param pathToRExecutalbe the path to r executalbe
     	 * @param pathToRExecutalbe the path to r executable
     	 * @param host the host
     	 * @param port the port
     	 * @throws RWorkspaceException the r workspace exception
     	 */
     	public static final void initializeRWorkspace(String pathToRExecutalbe,
     			String host, int port) throws RWorkspaceException {
     		workspace = new RWorkspace(pathToRExecutalbe, host, port, false);
     		workspace = new RWorkspace(pathToRExecutalbe, host, port, isDebugMode());
+    	}
     	// --------------------------------------
-...
     	 */
     	public RWorkspace(File userDir) throws RWorkspaceException {
     		this.userdir = userDir;
     		setLog(isLoggingEvalCommandLines());
+    	}
     	// --------------------------------------
-...
     		} catch (Exception e) {
     			throw new RException(exp + "; " + e.getMessage(), e); //$NON-NLS-1$
+    		}
     //		if(this.isLoggingEvalCommandLines())	{
     			//Log.finest("EVALUATED_EXPRESSION" + exp ); //$NON-NLS-1$
     	//	}
     		return res;
+    	}
-...
     		expr = "try({" + expr + "}, silent=TRUE)";
     		if(this.isLoggingEvalCommandLines())	{
     			// normal code
     			//Log.finest("RWorkspace.safeEval(): " + expr); //$NON-NLS-1$
     			// FIXME: SJ: for debugging purpose
     			Log.finest("RWorkspace.safeEval(): " + expr, 8); //$NON-NLS-1$
     			//TODO Log.finest("R safeEval: " + expr, 8); //$NON-NLS-1$
     			Log.finest("R safeEval: " + expr); //$NON-NLS-1$
+    		}
     		REXP r = null;
-...
     	/**
     	 * Checks if the eval command lines must be logged.
     	 * Checks if the eval command lines preference is set
     	 * @return
     	 */
     	public boolean isLoggingEvalCommandLines()	{
     	public static boolean isLoggingEvalCommandLines()	{
     		return RPreferences.getInstance().getBoolean(RPreferences.SHOW_EVAL_LOGS);
+    	}
     	/**
     	 * Checks if the debug mode preference is set.
     	 * @return
     	 */
     	public static boolean isDebugMode()	{
     		return RPreferences.getInstance().getBoolean(RPreferences.DEBUG);
+    	}
     	/**
     	 * Sets the log.
+    	 *
     	 * @param start the new log
-...
     		String out = null;
     		try {
     			if(this.isLoggingEvalCommandLines())	{
     				Log.finest("R userEval: " + exp ); //$NON-NLS-1$
+    			}
     			//out = connection.eval("paste(capture.output(print(" + trybegin + trybegin +"("+ exp+")" + tryend + tryend + ")),collapse=\"\\n\")").asString(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     			//String cmd = "paste(capture.output(print(" + trybegin + "("+ exp+")" + tryend + ")),collapse=\"\\n\")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     			Log.fine("R eval: "+exp);
     			REXP ret = connection.eval(exp);
     			//REXP ret = connection.eval(exp);
-...
     			System.out.println("REXPMismatchException: "+e);
     			Log.printStackTrace(e);
+    		}
     		if(this.isLoggingEvalCommandLines())	{
     			Log.finest("EVALUATED_EXPRESSION: " + exp ); //$NON-NLS-1$
+    		}
     		return out;
+    	}
-...
     		} catch (Exception e) {
     			org.txm.utils.logger.Log.printStackTrace(e);
+    		}
     		if(this.isLoggingEvalCommandLines())	{
     			Log.finest("EVALUATED_EXPRESSION: " + exp ); //$NON-NLS-1$
+    		}
+    	}

     	 */
     	public static final String SHOW_EVAL_LOGS = "show_eval_logs"; //$NON-NLS-1$
     	/**
+    	 *
     	 */
-...
     		preferences.put(RSERVEARGS, "");
     		preferences.putBoolean(FILE_TRANSFERT, false);
     		preferences.put(SVG_DEVICE, "svg");
     		preferences.putBoolean(SHOW_EVAL_LOGS, true);
     		preferences.putBoolean(SHOW_EVAL_LOGS, false);
     		String RFRAGMENT = "org.txm.statsengine.r.core."+System.getProperty("osgi.os"); //$NON-NLS-1$
     		Log.fine("RPreferences.initializeDefaultPreferences()");
-...
     		put(RSERVEARGS, ""); //$NON-NLS-1$
     		put(FILE_TRANSFERT, false);
     		put(SVG_DEVICE, "svg"); //$NON-NLS-1$
     		put(SHOW_EVAL_LOGS, true);
     		put(SHOW_EVAL_LOGS, false);
     		Log.fine(TXMCoreMessages.bind("R stats engine preferences set with: {0} and {1}.", OSDir.getAbsolutePath(), execFile.getAbsolutePath())); //$NON-NLS-1$
+    	}

     			rProcess = runtime.exec(cmdline);
     			//Log.info(Messages.StartRserve_0+Arrays.toString(cmdline));
     			StreamHog errStream = new StreamHog(rProcess.getErrorStream(), debug);
     			StreamHog inStream = new StreamHog(rProcess.getInputStream(), debug);
     			StreamHog errStream = new StreamHog(rProcess.getErrorStream(), RWorkspace.isLoggingEvalCommandLines());
     			StreamHog inStream = new StreamHog(rProcess.getInputStream(), RWorkspace.isLoggingEvalCommandLines());
     			RWorkspace.getRWorkspaceInstance().registerLogger(errStream, inStream);
     			//if (!debug && !isWindows) Rserveprocess.waitFor();

Laboratoire ICAR » Plateforme TXM

Révision 1760