added Value as response (#988)

* added Value as response

* added json report from process object

* update

* update

* fix error.

Author: EvenSol

src/main/java/neqsim/processSimulation/SimulationInterface.java

@@ -151,4 +151,14 @@ public default void runTransient(double dt, UUID id) {
    * @return a boolean
    */
   public boolean solved();
+
+  /**
+   * <p>
+   * getReport_json
+   * </p>
+   * Return results of simulation in json format
+   * 
+   * @return a String
+   */
+  public String getReport_json();
 }

src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java

@@ -15,6 +15,7 @@
 import neqsim.processSimulation.controllerDevice.ControllerDeviceInterface;
 import neqsim.processSimulation.mechanicalDesign.MechanicalDesign;
 import neqsim.processSimulation.processEquipment.stream.EnergyStream;
+import neqsim.processSimulation.util.report.Report;
 import neqsim.thermo.system.SystemInterface;
 
 /**
@@ -58,7 +59,8 @@ public SystemInterface getThermoSystem() {
 
   /** {@inheritDoc} */
   @Override
-  public void displayResult() {}
+  public void displayResult() {
+  }
 
   /**
    * Create deep copy.
@@ -87,7 +89,8 @@ public Object getProperty(String propertyName) {
 
   /** {@inheritDoc} */
   @Override
-  public void setRegulatorOutSignal(double signal) {}
+  public void setRegulatorOutSignal(double signal) {
+  }
 
   /** {@inheritDoc} */
   @Override
@@ -101,8 +104,9 @@ public void setController(ControllerDeviceInterface controller) {
    * Setter for the field <code>flowValveController</code>.
    * </p>
    *
-   * @param controller a {@link neqsim.processSimulation.controllerDevice.ControllerDeviceInterface}
-   *        object
+   * @param controller a
+   *                   {@link neqsim.processSimulation.controllerDevice.ControllerDeviceInterface}
+   *                   object
    */
   public void setFlowValveController(ControllerDeviceInterface controller) {
     this.flowValveController = controller;
@@ -122,7 +126,8 @@ public MechanicalDesign getMechanicalDesign() {
 
   /** {@inheritDoc} */
   @Override
-  public void initMechanicalDesign() {}
+  public void initMechanicalDesign() {
+  }
 
   /** {@inheritDoc} */
   @Override
@@ -153,7 +158,9 @@ public boolean solved() {
    * Getter for the field <code>energyStream</code>.
    * </p>
    *
-   * @return a {@link neqsim.processSimulation.processEquipment.stream.EnergyStream} object
+   * @return a
+   *         {@link neqsim.processSimulation.processEquipment.stream.EnergyStream}
+   *         object
    */
   public EnergyStream getEnergyStream() {
     return energyStream;
@@ -164,8 +171,9 @@ public EnergyStream getEnergyStream() {
    * Setter for the field <code>energyStream</code>.
    * </p>
    *
-   * @param energyStream a {@link neqsim.processSimulation.processEquipment.stream.EnergyStream}
-   *        object
+   * @param energyStream a
+   *                     {@link neqsim.processSimulation.processEquipment.stream.EnergyStream}
+   *                     object
    */
   public void setEnergyStream(EnergyStream energyStream) {
     setEnergyStream(true);
@@ -232,7 +240,8 @@ public double getExergyChange(String unit, double surroundingTemperature) {
 
   /** {@inheritDoc} */
   @Override
-  public void runConditionAnalysis(ProcessEquipmentInterface refExchanger) {}
+  public void runConditionAnalysis(ProcessEquipmentInterface refExchanger) {
+  }
 
   public String conditionAnalysisMessage = "";
 
@@ -294,6 +303,15 @@ public String toJson() {
     return null;
   }
 
+  /**
+   * {@inheritDoc}
+   * 
+   * @return a String
+   */
+  public String getReport_json() {
+    return new Report(this).json();
+  }
+
   /** {@inheritDoc} */
   @Override
   public void run_step(UUID id) {

src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java

@@ -222,4 +222,14 @@ public default SystemInterface getFluid() {
    * @return a String
    */
   public String toJson();
+
+  /**
+   * <p>
+   * getReport_json
+   * </p>
+   * Return results of simulation in json format
+   * 
+   * @return a String
+   */
+  public String getReport_json();
 }

src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java

@@ -9,10 +9,13 @@
 import neqsim.processSimulation.SimulationBaseClass;
 import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface;
 import neqsim.processSimulation.processEquipment.util.Recycle;
+import neqsim.processSimulation.util.report.Report;
 
 /**
- * A class representing a process module class that can contain unit operations and other modules.
- * Module will be runnning until all recycles in this module are solved. If no recycle in the module
+ * A class representing a process module class that can contain unit operations
+ * and other modules.
+ * Module will be runnning until all recycles in this module are solved. If no
+ * recycle in the module
  * then run only once.
  *
  * @author [seros]
@@ -53,7 +56,8 @@ public ProcessModule(String name) {
   /**
    * Add an unit operation to the process module.
    *
-   * @param processSystem the process system that contains the unit operations to be added.
+   * @param processSystem the process system that contains the unit operations to
+   *                      be added.
    */
 
   public void add(ProcessSystem processSystem) {
@@ -82,7 +86,8 @@ public List<ProcessSystem> getAddedUnitOperations() {
   }
 
   /**
-   * Get the list of operations index. The operations index is used to follow the correct order of
+   * Get the list of operations index. The operations index is used to follow the
+   * correct order of
    * calculations.
    *
    * @return the list of operations index
@@ -103,7 +108,8 @@ public List<ProcessModule> getAddedModules() {
   }
 
   /**
-   * Get the list of module index. The module index is used to follow the correct order of
+   * Get the list of module index. The module index is used to follow the correct
+   * order of
    * calculations.
    *
    * @return the list of module index
@@ -197,11 +203,13 @@ public Thread runAsThread() {
   }
 
   /**
-   * Returns the unit with the given name from the list of added unit operations and list of added
+   * Returns the unit with the given name from the list of added unit operations
+   * and list of added
    * modules.
    *
    * @param name the name of the unit to retrieve
-   * @return the unit with the given name, or {@code null} if no such unit is found
+   * @return the unit with the given name, or {@code null} if no such unit is
+   *         found
    */
   public Object getUnit(String name) {
     for (ProcessSystem processSystem : addedUnitOperations) {
@@ -221,11 +229,13 @@ public Object getUnit(String name) {
   }
 
   /**
-   * Returns the unit with the given name from the list of added unit operations and list of added
+   * Returns the unit with the given name from the list of added unit operations
+   * and list of added
    * modules.
    *
    * @param name the name of the unit to retrieve
-   * @return the unit with the given name, or {@code null} if no such unit is found
+   * @return the unit with the given name, or {@code null} if no such unit is
+   *         found
    */
   public Object getMeasurementDevice(String name) {
     for (ProcessSystem processSystem : addedUnitOperations) {
@@ -261,6 +271,14 @@ public ArrayList<String[]> getReport() {
     return null;
   }
 
+  /**
+   * {@inheritDoc}
+   * 
+   * @return a String
+   */
+  public String getReport_json() {
+    return new Report(this).json();
+  }
 
   /** {@inheritDoc} */
   @Override

src/main/java/neqsim/processSimulation/processSystem/ProcessModuleBaseClass.java

@@ -11,6 +11,7 @@
 import neqsim.processSimulation.controllerDevice.ControllerDeviceInterface;
 import neqsim.processSimulation.mechanicalDesign.MechanicalDesign;
 import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface;
+import neqsim.processSimulation.util.report.Report;
 import neqsim.thermo.system.SystemInterface;
 
 /**
@@ -250,6 +251,14 @@ public String toJson() {
     return null;
   }
 
+  /**
+   * {@inheritDoc}
+   * 
+   * @return a String
+   */
+  public String getReport_json() {
+    return new Report(this).json();
+  }
 
   /** {@inheritDoc} */
   @Override

src/main/java/neqsim/processSimulation/processSystem/ProcessSystem.java

@@ -18,6 +18,7 @@
 import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface;
 import neqsim.processSimulation.processEquipment.util.Recycle;
 import neqsim.processSimulation.processEquipment.util.RecycleController;
+import neqsim.processSimulation.util.report.Report;
 import neqsim.thermo.system.SystemInterface;
 
 /**
@@ -977,6 +978,15 @@ public boolean equals(Object obj) {
         && Objects.equals(unitOperations, other.unitOperations);
   }
 
+  /**
+   * {@inheritDoc}
+   * 
+   * @return a String
+   */
+  public String getReport_json() {
+    return new Report(this).json();
+  }
+
   /*
    * @XmlRootElement private class Report extends Object{ public Double name; public
    * ArrayList<ReportInterface> unitOperationsReports = new ArrayList<ReportInterface>();

src/main/java/neqsim/processSimulation/util/monitor/StreamResponse.java

@@ -1,6 +1,6 @@
 package neqsim.processSimulation.util.monitor;
 
-import java.util.ArrayList;
+import java.util.HashMap;
 import neqsim.processSimulation.processEquipment.stream.StreamInterface;
 
 /**
@@ -23,27 +23,27 @@ public class StreamResponse {
   public Double massflowGas;
   public Double massflowOil;
   public Double massflowAqueous;
-  public ArrayList<String[]> data = new ArrayList<String[]>();
+  public HashMap<String, Value> data = new HashMap<String, Value>();
 
   /**
    * <p>
    * Constructor for StreamResponse.
    * </p>
    *
-   * @param inputStream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface}
-   *        object
+   * @param inputStream a
+   *                    {@link neqsim.processSimulation.processEquipment.stream.StreamInterface}
+   *                    object
    */
   public StreamResponse(StreamInterface inputStream) {
 
     name = inputStream.getName();
 
-    data.add(new String[] {"temperature",
-        Double
-            .toString(inputStream.getTemperature(neqsim.util.unit.Units.getSymbol("temperature"))),
-        neqsim.util.unit.Units.getSymbol("temperature")});
-    data.add(new String[] {"pressure",
-        Double.toString(inputStream.getPressure(neqsim.util.unit.Units.getSymbol("pressure"))),
-        neqsim.util.unit.Units.getSymbol("pressure")});
+    data.put("temperature",
+        new Value(Double.toString(inputStream.getTemperature(neqsim.util.unit.Units.getSymbol("temperature"))),
+            neqsim.util.unit.Units.getSymbol("temperature")));
+    data.put("pressure",
+        new Value(Double.toString(inputStream.getPressure(neqsim.util.unit.Units.getSymbol("pressure"))),
+            neqsim.util.unit.Units.getSymbol("pressure")));
 
     fluid = new Fluid(inputStream.getFluid());
     temperature = inputStream.getTemperature("C");
@@ -75,5 +75,6 @@ public StreamResponse(StreamInterface inputStream) {
    * print.
    * </p>
    */
-  public void print() {}
+  public void print() {
+  }
 }

src/main/java/neqsim/processSimulation/util/monitor/Value.java

@@ -0,0 +1,15 @@
+package neqsim.processSimulation.util.monitor;
+
+/**
+ * Unit class nested within Units.
+ */
+public class Value {
+  public String value;
+  public String unit;
+
+  public Value(String value, String unit) {
+    this.value = value;
+    this.unit = unit;
+  }
+
+}

src/main/java/neqsim/processSimulation/util/report/Report.java

@@ -4,7 +4,10 @@
 import java.util.List;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import neqsim.processSimulation.processEquipment.ProcessEquipmentBaseClass;
 import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface;
+import neqsim.processSimulation.processSystem.ProcessModule;
+import neqsim.processSimulation.processSystem.ProcessModuleBaseClass;
 import neqsim.processSimulation.processSystem.ProcessSystem;
 
 /**
@@ -20,12 +23,25 @@ public class Report {
   public static HashMap<String, String> json_reports = new HashMap<>();
   Gson gson = new Gson();
   ProcessSystem process;
+  ProcessEquipmentBaseClass processEquipment;
 
   public Report(ProcessSystem process) {
     this.process = process;
   }
 
-  public String json() {
+  public Report(ProcessEquipmentBaseClass processEquipmentBaseClass) {
+    processEquipment = processEquipmentBaseClass;
+  }
+
+  public Report(ProcessModule processModule) {
+    // TODO Auto-generated constructor stub
+  }
+
+  public Report(ProcessModuleBaseClass processModuleBaseClass) {
+    //TODO Auto-generated constructor stub
+}
+
+public String json() {
     for (ProcessEquipmentInterface unit : process.getUnitOperations()) {
       json_reports.put(unit.getName(), unit.toJson());
     }