Skip to content

Commit

Permalink
further updates
Browse files Browse the repository at this point in the history
  • Loading branch information
EvenSol committed Oct 5, 2024
1 parent 6decc19 commit 04804b4
Show file tree
Hide file tree
Showing 64 changed files with 240 additions and 272 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.io.File;
import java.io.FileOutputStream;
import java.text.DecimalFormat;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand All @@ -16,15 +17,15 @@
* @author Even Solbraa
* @version $Id: $Id
*/
public class dataHandeling {
static Logger logger = LogManager.getLogger(dataHandeling.class);
public class DataHandeling {
static Logger logger = LogManager.getLogger(DataHandeling.class);

/**
* <p>
* Constructor for dataHandeling.
* </p>
*/
public dataHandeling() {}
public DataHandeling() {}

/**
* Returns the number of items in the specified series.
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.awt.Color;
import java.awt.image.BufferedImage;
import javax.swing.BorderFactory;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jfree.chart.ChartFactory;
Expand All @@ -27,9 +28,9 @@
* @author Even Solbraa
* @version $Id: $Id
*/
public class graph2b extends javax.swing.JFrame {
public class Graph2b extends javax.swing.JFrame {
private static final long serialVersionUID = 1000;
static Logger logger = LogManager.getLogger(graph2b.class);
static Logger logger = LogManager.getLogger(Graph2b.class);

XYDataset xyData;
String titl;
Expand All @@ -41,7 +42,7 @@ public class graph2b extends javax.swing.JFrame {
* Constructor for graph2b.
* </p>
*/
public graph2b() {
public Graph2b() {
initComponents();
pack();
}
Expand All @@ -53,7 +54,7 @@ public graph2b() {
*
* @param points an array of type double
*/
public graph2b(double[][] points) {
public Graph2b(double[][] points) {
String[] seriesNames = new String[points.length];
for (int i = 0; i < points.length; i++) {
seriesNames[i] = "";
Expand Down Expand Up @@ -103,7 +104,7 @@ public graph2b(double[][] points) {
* @param xaxis a {@link java.lang.String} object
* @param yaxis a {@link java.lang.String} object
*/
public graph2b(double[][] points, String[] seriesNames, String tit, String xaxis, String yaxis) {
public Graph2b(double[][] points, String[] seriesNames, String tit, String xaxis, String yaxis) {
XYSeriesCollection seriesCol = new XYSeriesCollection();

for (int serLen = 0; serLen < points.length / 2; serLen++) {
Expand Down Expand Up @@ -146,7 +147,7 @@ public graph2b(double[][] points, String[] seriesNames, String tit, String xaxis
* @param xaxis a {@link java.lang.String} object
* @param yaxis a {@link java.lang.String} object
*/
public graph2b(double[][] xpoints, double[][] points, String[] seriesNames, String tit,
public Graph2b(double[][] xpoints, double[][] points, String[] seriesNames, String tit,
String xaxis, String yaxis) {
XYSeriesCollection seriesCol = new XYSeriesCollection();

Expand Down Expand Up @@ -307,7 +308,7 @@ public ChartPanel getChartPanel() {
* @param args the command line arguments
*/
public static void main(String[] args) {
new graph2b().setVisible(true);
new Graph2b().setVisible(true);
}

/**
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary;

import Jama.Matrix;

import neqsim.fluidmechanics.flownode.FlowNodeInterface;
import neqsim.thermo.system.SystemInterface;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -331,23 +331,23 @@ public void setUseRealKappa(boolean useRealKappa) {
/** {@inheritDoc} */
@Override
public void plot() {
neqsim.datapresentation.jfreechart.graph2b graph =
new neqsim.datapresentation.jfreechart.graph2b(flow, head,
neqsim.datapresentation.jfreechart.Graph2b graph =
new neqsim.datapresentation.jfreechart.Graph2b(flow, head,
Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new), "head vs flow",
"flow", "head");
graph.setVisible(true);
neqsim.datapresentation.jfreechart.graph2b graph2 =
new neqsim.datapresentation.jfreechart.graph2b(flow, polytropicEfficiency,
neqsim.datapresentation.jfreechart.Graph2b graph2 =
new neqsim.datapresentation.jfreechart.Graph2b(flow, polytropicEfficiency,
Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new), "eff vs flow",
"flow", "eff");
graph2.setVisible(true);
neqsim.datapresentation.jfreechart.graph2b graph3 =
new neqsim.datapresentation.jfreechart.graph2b(redflow, redhead,
neqsim.datapresentation.jfreechart.Graph2b graph3 =
new neqsim.datapresentation.jfreechart.Graph2b(redflow, redhead,
Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new),
"red head vs red flow", "red flow", "red head");
graph3.setVisible(true);
neqsim.datapresentation.jfreechart.graph2b graph4 =
new neqsim.datapresentation.jfreechart.graph2b(redflow, polytropicEfficiency,
neqsim.datapresentation.jfreechart.Graph2b graph4 =
new neqsim.datapresentation.jfreechart.Graph2b(redflow, polytropicEfficiency,
Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new),
"red eff vs red dflow", "red flow", "red eff");
graph4.setVisible(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -342,23 +342,23 @@ public void setUseRealKappa(boolean useRealKappa) {
/** {@inheritDoc} */
@Override
public void plot() {
neqsim.datapresentation.jfreechart.graph2b graph =
new neqsim.datapresentation.jfreechart.graph2b(flow, head,
neqsim.datapresentation.jfreechart.Graph2b graph =
new neqsim.datapresentation.jfreechart.Graph2b(flow, head,
Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new), "head vs flow",
"flow", "head");
graph.setVisible(true);
neqsim.datapresentation.jfreechart.graph2b graph2 =
new neqsim.datapresentation.jfreechart.graph2b(flow, efficiency,
neqsim.datapresentation.jfreechart.Graph2b graph2 =
new neqsim.datapresentation.jfreechart.Graph2b(flow, efficiency,
Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new), "eff vs flow",
"flow", "eff");
graph2.setVisible(true);
neqsim.datapresentation.jfreechart.graph2b graph3 =
new neqsim.datapresentation.jfreechart.graph2b(redflow, redhead,
neqsim.datapresentation.jfreechart.Graph2b graph3 =
new neqsim.datapresentation.jfreechart.Graph2b(redflow, redhead,
Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new),
"red head vs red flow", "red flow", "red head");
graph3.setVisible(true);
neqsim.datapresentation.jfreechart.graph2b graph4 =
new neqsim.datapresentation.jfreechart.graph2b(redflow, efficiency,
neqsim.datapresentation.jfreechart.Graph2b graph4 =
new neqsim.datapresentation.jfreechart.Graph2b(redflow, efficiency,
Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new),
"red eff vs red dflow", "red flow", "red eff");
graph4.setVisible(true);
Expand Down
Loading

0 comments on commit 04804b4

Please sign in to comment.