El servidor en Java funciona correctamente, gestiona 3 hilos y se grafican los datos de dos controladores PID independientes...la funcionalidad de esta versión está comprobada

LoadCode · LoadCode · commit 589c5e2c9c35 · 2017-04-23T12:30:07.000-05:00
diff --git a/ControlThread.java b/ControlThread.java
@@ -13,12 +13,14 @@ public class ControlThread extends Thread
 	private DataOutputStream out;
 	private DataInputStream in;
 	private volatile boolean alive = true;
+	private int threadId;
 	
-	public ControlThread(Window _gui, Socket _socket, double _setpoint)
+	public ControlThread(Window _gui, Socket _socket, double _setpoint, int _threadId)
 	{	
 		this.socket = _socket;
 		this.setpoint = _setpoint;
 		this.gui = _gui;
+		this.threadId = _threadId;
 		try 
 		{
 			this.out = new DataOutputStream(this.socket.getOutputStream());
@@ -52,9 +54,18 @@ public void run()
 				System.out.println("No se pudo hacer la lectura de la señal o la transferencia del finish");
 				e.printStackTrace();
 			}
-			this.gui.output_I.add(time_value, output_process_val);
-			this.gui.input_I.add(time_value, input_process_val);
-			this.gui.setpoint_I.add(time_value, this.setpoint);
+			if(this.threadId == 1)
+			{
+				this.gui.output_I.add(time_value, output_process_val);
+				this.gui.input_I.add(time_value, input_process_val);
+				this.gui.setpoint_I.add(time_value, this.setpoint);
+			}
+			else if(this.threadId == 2)
+			{
+				this.gui.output_II.add(time_value, output_process_val);
+				this.gui.input_II.add(time_value, input_process_val);
+				this.gui.setpoint_II.add(time_value, this.setpoint);
+			}
 		}
 		try 
 		{
diff --git a/FileManager.java b/FileManager.java
@@ -12,11 +12,16 @@ public FileManager(String _fileName)
 	}
 	
 	
-	public void save_pid_signals(double [][]setpoint, double [][]signal, double [][]control)
+	public void save_pid_signals(double [][]setpointI, 
+								 double [][]signalI, 
+								 double [][]controlI, 
+								 double [][]setpointII, 
+								 double [][]signalII, 
+								 double [][]controlII)
 	{
 		/*
 		 * Este método genera una archivo con cuatro columnas que corresponden a:
-		 *    datos_tiempo     datos_setpoint     datos_control     datos_salida_planta
+		 *    datos_tiempo    datos_setpoint	datos_control	salida_planta_I	  datos_tiempo_II	 datos_setpoint_II	  datos_control_II	  salida_planta_II
 		 * */
 		BufferedWriter bufferedWriter = null;
 		FileWriter fileWriter = null;
@@ -26,8 +31,8 @@ public void save_pid_signals(double [][]setpoint, double [][]signal, double [][]
 			fileWriter = new FileWriter(this.fileName, true);
 			bufferedWriter = new BufferedWriter(fileWriter);
 			printWriter = new PrintWriter(bufferedWriter);
-			for(int i = 0; i < signal[0].length; i++)                  //time        //setpoint     //control      //plant's output    
-				bufferedWriter.write(String.format("%f\t%f\t%f\t%f\n", signal[0][i], setpoint[1][i], control[1][i], signal[1][i]));
+			for(int i = 0; i < signalI[0].length; i++)                                 //time        //setpoint     //control      //first plant's output  //time_process_II  //setpoint        //control_process_2     //second plant's output  
+				bufferedWriter.write(String.format("%f\t%f\t%f\t%f\t%f\t%f\t%f\t%\n", signalI[0][i], setpointI[1][i], controlI[1][i], signalI[1][i],       signalII[0][i],    setpointII[1][i], controlII[1][i],        signalII[1][i]));
 				
 		}
 		catch(IOException e)
diff --git a/ThreadServer.java b/ThreadServer.java
@@ -31,7 +31,6 @@ public class ThreadServer extends Thread
 	private ControlThread threadFlow;
 	
 	
-	
 	public ThreadServer(Window _gui)
 	{
 		this.gui = _gui;
@@ -116,9 +115,12 @@ public void terminate()
 		System.out.format("La cantidad de elementos es: %d\n", this.gui.output_I.getItemCount());
 		
 		// option to save the captured data
-		double[][] logged_signal = this.gui.output_I.toArray();
-		double[][] control_signal = this.gui.input_I.toArray();
-		double[][] setpoint_signal = this.gui.setpoint_I.toArray();
+		double[][] logged_signal_I = this.gui.output_I.toArray();
+		double[][] control_signal_I = this.gui.input_I.toArray();
+		double[][] setpoint_signal_I = this.gui.setpoint_I.toArray();
+		double[][] logged_signal_II = this.gui.output_II.toArray();
+		double[][] control_signal_II = this.gui.input_II.toArray();
+		double[][] setpoint_signal_II = this.gui.setpoint_II.toArray();
 		
 		// Dialogo para seleccionar donde almacenar el archivo
 		JFileChooser fileChooser = new JFileChooser();
@@ -129,7 +131,7 @@ public void terminate()
 		{
 		    File fileToSave = fileChooser.getSelectedFile();
 		    FileManager fileSaving = new FileManager(fileToSave.getAbsolutePath());
-			fileSaving.save_pid_signals(setpoint_signal, logged_signal, control_signal);
+			fileSaving.save_pid_signals(setpoint_signal_I, logged_signal_I, control_signal_I, setpoint_signal_II, logged_signal_II, control_signal_II);
 			System.out.println("Archivo guardado");
 		}
 		else
@@ -184,7 +186,7 @@ public void run()
 		try
 		{
 			this.socket = server.accept();
-			threadTemp = new ControlThread(this.gui, this.socket, this.setpointT);
+			threadTemp = new ControlThread(this.gui, this.socket, this.setpointT, 1);
 			threadTemp.start();
 		}
 		catch(Exception e)
@@ -197,7 +199,7 @@ public void run()
 		try
 		{
 			this.socket = server.accept();
-			threadFlow = new ControlThread(this.gui, this.socket, this.setpointF);
+			threadFlow = new ControlThread(this.gui, this.socket, this.setpointF, 2);
 			threadFlow.start();
 		}
 		catch(Exception e)
