From 550e9956d862f02dfa91412762178ce4b3fae9bb Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Tue, 29 Jan 2013 13:52:30 +0000 Subject: [PATCH] refs #25, #24 Organized imports and some minor fix-ups --- src/eva2/client/EvAClient.java | 1 - src/eva2/gui/BigStringEditor.java | 6 +- src/eva2/gui/FunctionArea.java | 236 +++++------------- .../GenericOptimizationObjectivesEditor.java | 12 +- src/eva2/gui/GenericRemoteServersEditor.java | 10 +- src/eva2/gui/JExtDesktopPaneToolBar.java | 2 +- src/eva2/gui/JExtMenu.java | 6 +- src/eva2/gui/LoggingPanel.java | 15 +- src/eva2/gui/Plot.java | 23 +- src/eva2/gui/PropertyDialog.java | 7 +- src/eva2/gui/PropertySheetPanelStat.java | 1 - src/eva2/server/go/GOStandaloneVersion.java | 1 - src/eva2/server/go/MOCCOStandalone.java | 1 - .../ParetoFrontViewScatterPlot.java | 7 +- .../cluster/ClusteringNearestBetter.java | 9 +- .../constraint/GenericConstraint.java | 3 +- .../constraint/IntervalConstraint.java | 3 +- .../operators/crossover/CrossoverOBGAPMX.java | 1 - .../operators/crossover/TestESCrossover.java | 10 +- .../distancemetric/IndividualDataMetric.java | 3 +- .../distancemetric/PhenotypeMetric.java | 3 +- .../GAGIInitializeSegmentwise.java | 3 +- .../migration/MOXMeansSeparation.java | 3 +- .../mutation/MutateESCorrVector.java | 3 +- .../go/operators/mutation/MutateESGlobal.java | 3 +- .../mutation/MutateGPSingleNode.java | 3 +- .../paramcontrol/PSOInertnessAdaption.java | 3 +- .../paramcontrol/SinusoidalParamAdaption.java | 3 +- ...ntNondominatedSortingDistanceCrowding.java | 5 +- .../PopulationMeasureTerminator.java | 3 +- .../go/problems/ConstrPressureVessel.java | 3 +- src/eva2/server/go/problems/FLensProblem.java | 18 +- .../InterfaceMultiObjectiveDeNovoProblem.java | 3 - src/eva2/server/go/strategies/BOA.java | 21 +- src/eva2/server/go/strategies/LTGA.java | 13 +- src/eva2/server/go/strategies/MLTGA.java | 13 +- .../ParticleSwarmOptimizationGCPSO.java | 2 +- src/eva2/server/go/tools/FileTools.java | 8 +- .../GeneralGenericObjectEditorPanel.java | 16 +- .../server/modules/AbstractGOParameters.java | 7 +- .../server/modules/AbstractModuleAdapter.java | 5 +- src/eva2/server/modules/DEParameters.java | 3 +- src/eva2/server/stat/EvAJobList.java | 26 +- src/eva2/server/stat/StatisticsWithGUI.java | 9 +- src/eva2/tools/print/PagePrinter.java | 2 +- test/eva2/tools/SerializerTest.java | 2 +- 46 files changed, 186 insertions(+), 354 deletions(-) diff --git a/src/eva2/client/EvAClient.java b/src/eva2/client/EvAClient.java index f70a3c69..ce865248 100644 --- a/src/eva2/client/EvAClient.java +++ b/src/eva2/client/EvAClient.java @@ -12,7 +12,6 @@ package eva2.client; * $Author: mkron $ */ import eva2.EvAInfo; -import eva2.client.SplashScreen; import eva2.gui.*; import eva2.server.EvAServer; import eva2.server.go.InterfaceGOParameters; diff --git a/src/eva2/gui/BigStringEditor.java b/src/eva2/gui/BigStringEditor.java index 6e0208cb..098ced4b 100644 --- a/src/eva2/gui/BigStringEditor.java +++ b/src/eva2/gui/BigStringEditor.java @@ -12,10 +12,10 @@ package eva2.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ -import java.beans.*; import java.awt.*; -import java.awt.event.*; -import javax.swing.*; +import java.awt.event.*; +import java.beans.*; +import javax.swing.*; /*==========================================================================* * CLASS DECLARATION diff --git a/src/eva2/gui/FunctionArea.java b/src/eva2/gui/FunctionArea.java index f7d7dd95..010e70ec 100644 --- a/src/eva2/gui/FunctionArea.java +++ b/src/eva2/gui/FunctionArea.java @@ -48,11 +48,6 @@ import javax.swing.JFileChooser; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; -/* - * ==========================================================================* - * CLASS DECLARATION - *========================================================================== - */ /** * */ @@ -132,7 +127,7 @@ public class FunctionArea extends DArea implements Serializable { if (isShowGraphToolTips()) { int gIndex = getNearestGraphIndex(event.getX(), event.getY()); if (gIndex >= 0) { - StringBuffer sb = new StringBuffer(super.getToolTipText()); + StringBuilder sb = new StringBuilder(super.getToolTipText()); sb.append(gIndex); sb.append(": "); sb.append(getGraphInfo(gIndex)); @@ -188,7 +183,6 @@ public class FunctionArea extends DArea implements Serializable { */ private void addPopup() { addMouseListener(new MouseAdapter() { - @Override public void mouseClicked(MouseEvent e) { if ((e.getModifiers() & InputEvent.BUTTON1_MASK) == InputEvent.BUTTON1_MASK) { @@ -199,7 +193,6 @@ public class FunctionArea extends DArea implements Serializable { yPos = e.getY(); addMenuItem(graphPopupMenu, "Rename graph", new ActionListener() { - @Override public void actionPerformed(ActionEvent ee) { renameGraph(getNearestGraphIndex(FunctionArea.this.xPos, FunctionArea.this.yPos)); @@ -211,17 +204,15 @@ public class FunctionArea extends DArea implements Serializable { + " graph tool tips"; addMenuItem(graphPopupMenu, togGTTName, new ActionListener() { - @Override - public void actionPerformed(ActionEvent ee) { - setShowGraphToolTips(!isShowGraphToolTips()); - } - }); + public void actionPerformed(ActionEvent ee) { + setShowGraphToolTips(!isShowGraphToolTips()); + } + }); String togLName = (isShowLegend() ? "Hide" : "Show") + " legend"; addMenuItem(graphPopupMenu, togLName, new ActionListener() { - @Override public void actionPerformed(ActionEvent ee) { toggleLegend(); @@ -229,7 +220,6 @@ public class FunctionArea extends DArea implements Serializable { }); addMenuItem(graphPopupMenu, "Toggle scientific format", new ActionListener() { - @Override public void actionPerformed(ActionEvent ee) { toggleScientificY(true); @@ -239,12 +229,11 @@ public class FunctionArea extends DArea implements Serializable { if (FunctionArea.this.pointSetContainer.size() > 0) { addMenuItem(graphPopupMenu, "Recolor all graphs", new ActionListener() { - @Override - public void actionPerformed(ActionEvent ee) { - recolorAllGraphsByIndex(); - } - }); + public void actionPerformed(ActionEvent ee) { + recolorAllGraphsByIndex(); + } + }); } if (refPointListener != null) { @@ -252,17 +241,16 @@ public class FunctionArea extends DArea implements Serializable { addMenuItem(graphPopupMenu, "Select Reference Point:(" + temp.x + "/" + temp.y + ")", new ActionListener() { - @Override - public void actionPerformed(ActionEvent ee) { - DPoint temp = getDMeasures().getDPoint( - xPos, yPos); - double[] point = new double[2]; - point[0] = temp.x; - point[1] = temp.y; - refPointListener.refPointGiven(point); - } - }); + public void actionPerformed(ActionEvent ee) { + DPoint temp = getDMeasures().getDPoint( + xPos, yPos); + double[] point = new double[2]; + point[0] = temp.x; + point[1] = temp.y; + refPointListener.refPointGiven(point); + } + }); } // darn this point is an empty copy !! @@ -272,21 +260,19 @@ public class FunctionArea extends DArea implements Serializable { addMenuItem(graphPopupMenu, "Nearest point: (" + point.x + "/" + point.y + ")", new ActionListener() { - @Override - public void actionPerformed(ActionEvent ee) { - } - }, false); + public void actionPerformed(ActionEvent ee) { + } + }, false); addMenuItem(graphPopupMenu, " Remove point", new ActionListener() { - @Override - public void actionPerformed(ActionEvent ee) { - removePoint(FunctionArea.this.xPos, - FunctionArea.this.yPos); - } - }); + public void actionPerformed(ActionEvent ee) { + removePoint(FunctionArea.this.xPos, + FunctionArea.this.yPos); + } + }); if (point.getIcon() instanceof InterfaceSelectablePointIcon) { currentPointIcon = point.getIcon(); @@ -296,14 +282,13 @@ public class FunctionArea extends DArea implements Serializable { : " Select individual"; addMenuItem(graphPopupMenu, selectTitle, new ActionListener() { - @Override - public void actionPerformed( - ActionEvent ee) { - ((InterfaceSelectablePointIcon) currentPointIcon).getSelectionListener().individualSelected( - ((InterfaceSelectablePointIcon) currentPointIcon).getEAIndividual()); - } - }); + public void actionPerformed( + ActionEvent ee) { + ((InterfaceSelectablePointIcon) currentPointIcon).getSelectionListener().individualSelected( + ((InterfaceSelectablePointIcon) currentPointIcon).getEAIndividual()); + } + }); } } @@ -311,71 +296,62 @@ public class FunctionArea extends DArea implements Serializable { currentPointIcon = point.getIcon(); addMenuItem(graphPopupMenu, " Show individual", new ActionListener() { - @Override - public void actionPerformed( - ActionEvent ee) { - ((InterfaceDPointWithContent) currentPointIcon).showIndividual(); - } - }); + public void actionPerformed( + ActionEvent ee) { + ((InterfaceDPointWithContent) currentPointIcon).showIndividual(); + } + }); } } - if (FunctionArea.this.pointSetContainer.size() > 0) { // there - // is - // at - // least - // one - // graph + if (FunctionArea.this.pointSetContainer.size() > 0) { + // there is at least one graph // The graph info element // int gIndex = getNearestGraphIndex(e.getX(), // e.getY()); addMenuItem(graphPopupMenu, "Graph Info: " + getGraphInfo(e.getX(), e.getY()), new ActionListener() { - @Override - public void actionPerformed(ActionEvent ee) { - DPoint temp = FunctionArea.this.getDMeasures().getDPoint( - FunctionArea.this.xPos, - FunctionArea.this.yPos); - DPointIcon icon1 = new DPointIcon() { - + public void actionPerformed(ActionEvent ee) { + DPoint temp = FunctionArea.this.getDMeasures().getDPoint( + FunctionArea.this.xPos, + FunctionArea.this.yPos); + DPointIcon icon1 = new DPointIcon() { @Override - public DBorder getDBorder() { - return new DBorder(4, 4, 4, 4); - } - - @Override - public void paint(Graphics g) { - g.drawLine(-2, 0, 2, 0); - g.drawLine(0, 0, 0, 4); - } - }; - temp.setIcon(icon1); - FunctionArea.this.addDElement(temp); + public DBorder getDBorder() { + return new DBorder(4, 4, 4, 4); } - }, false); + + @Override + public void paint(Graphics g) { + g.drawLine(-2, 0, 2, 0); + g.drawLine(0, 0, 0, 4); + } + }; + temp.setIcon(icon1); + FunctionArea.this.addDElement(temp); + } + }, false); addMenuItem(graphPopupMenu, " Remove graph", new ActionListener() { - @Override - public void actionPerformed(ActionEvent ee) { - clearGraph(FunctionArea.this.xPos, - FunctionArea.this.yPos); - } - }); + public void actionPerformed(ActionEvent ee) { + clearGraph(FunctionArea.this.xPos, + FunctionArea.this.yPos); + } + }); addMenuItem(graphPopupMenu, " Change graph color", new ActionListener() { - @Override - public void actionPerformed(ActionEvent ee) { - changeColorGraph(FunctionArea.this.xPos, - FunctionArea.this.yPos); - } - }); + public void actionPerformed(ActionEvent ee) { + changeColorGraph(FunctionArea.this.xPos, + FunctionArea.this.yPos); + } + }); } graphPopupMenu.show(FunctionArea.this, e.getX(), e.getY()); } @@ -636,19 +612,6 @@ public class FunctionArea extends DArea implements Serializable { addDElement(popRep); } - // public void setConnectedPoint(double x, double y, int GraphLabel) { - // if (m_log == true && y <= 0.0) { - // // y = Double.MIN_VALUE; - // if (notifyNegLog) { - // System.err.println("Warning: trying to plot value (" + x + "/" + y + - // ") with y <= 0 in logarithmic mode! Setting y to " + 1e-30); - // notifyNegLog = false; - // } - // y = 1e-30; - // } - // getGraphPointSet(GraphLabel).addDPoint(x, y); - // - // } /** * Plot an icon to the function area which is annotated with a char and a * double value. The color corresponds to the color of the graph with given @@ -839,8 +802,6 @@ public class FunctionArea extends DArea implements Serializable { * @return */ private GraphPointSet getGraphPointSet(int GraphLabel) { - // System.out.println("looping through " + m_PointSetContainer.size() + - // " point sets..."); for (int i = 0; i < pointSetContainer.size(); i++) { if (pointSetContainer.get(i) instanceof GraphPointSet) { GraphPointSet xx = (GraphPointSet) (pointSetContainer.get(i)); @@ -1059,69 +1020,6 @@ public class FunctionArea extends DArea implements Serializable { this.getGraphPointSet(GraphLabel).setColor(color); } - // /** - // */ - // public Object openObject() { - // if (m_FileChooser == null) - // createFileChooser(); - // int returnVal = m_FileChooser.showOpenDialog(this); - // if (returnVal == JFileChooser.APPROVE_OPTION) { - // File selected = m_FileChooser.getSelectedFile(); - // try { - // ObjectInputStream oi = new ObjectInputStream(new BufferedInputStream(new - // FileInputStream(selected))); - // Object obj = oi.readObject(); - // oi.close(); - // - // Object[] objects = (Object[]) obj; - // for (int i = 0; i < objects.length; i++) { - // GraphPointSet xx = ((GraphPointSet.SerPointSet) - // objects[i]).getGraphPointSet(); - // xx.initGraph(this); - // addGraphPointSet(xx); - // } - // repaint(); - // return obj; - // } catch (Exception ex) { - // JOptionPane.showMessageDialog(this, - // "Couldn't read object: " - // + selected.getName() - // + "\n" + ex.getMessage(), - // "Open object file", - // JOptionPane.ERROR_MESSAGE); - // } - // } - // return null; - // } - // /** - // * - // */ - // public void saveObject() { - // Object[] object = new Object[m_PointSetContainer.size()]; - // for (int i = 0; i < m_PointSetContainer.size(); i++) { - // object[i] = ((GraphPointSet) - // m_PointSetContainer.get(i)).getSerPointSet(); - // } - // if (m_FileChooser == null) - // createFileChooser(); - // int returnVal = m_FileChooser.showSaveDialog(this); - // if (returnVal == JFileChooser.APPROVE_OPTION) { - // File sFile = m_FileChooser.getSelectedFile(); - // try { - // ObjectOutputStream oo = new ObjectOutputStream(new - // BufferedOutputStream(new FileOutputStream(sFile))); - // oo.writeObject(object); - // oo.close(); - // } catch (IOException ex) { - // JOptionPane.showMessageDialog(this, - // "Couldn't write to file: " - // + sFile.getName() - // + "\n" + ex.getMessage(), - // "Save object", - // JOptionPane.ERROR_MESSAGE); - // } - // } - // } /** * * @param GraphLabel diff --git a/src/eva2/gui/GenericOptimizationObjectivesEditor.java b/src/eva2/gui/GenericOptimizationObjectivesEditor.java index 68eb4470..8e7047b6 100644 --- a/src/eva2/gui/GenericOptimizationObjectivesEditor.java +++ b/src/eva2/gui/GenericOptimizationObjectivesEditor.java @@ -1,6 +1,11 @@ package eva2.gui; +import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.problems.InterfaceOptimizationTarget; +import eva2.server.go.tools.AbstractObjectEditor; +import eva2.server.go.tools.GeneralGOEProperty; +import eva2.tools.BasicResourceLoader; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; @@ -17,7 +22,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.beans.PropertyEditor; - import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -28,12 +32,6 @@ import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.SwingConstants; -import eva2.server.go.problems.InterfaceOptimizationObjective; -import eva2.server.go.problems.InterfaceOptimizationTarget; -import eva2.server.go.tools.AbstractObjectEditor; -import eva2.server.go.tools.GeneralGOEProperty; -import eva2.tools.BasicResourceLoader; - /** * Created by IntelliJ IDEA. diff --git a/src/eva2/gui/GenericRemoteServersEditor.java b/src/eva2/gui/GenericRemoteServersEditor.java index 0104adbc..c53ba707 100644 --- a/src/eva2/gui/GenericRemoteServersEditor.java +++ b/src/eva2/gui/GenericRemoteServersEditor.java @@ -1,16 +1,14 @@ package eva2.gui; -import javax.swing.*; - import eva2.tools.BasicResourceLoader; - -import java.beans.PropertyEditor; -import java.beans.PropertyChangeSupport; -import java.beans.PropertyChangeListener; import java.awt.*; import java.awt.event.*; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.beans.PropertyEditor; import java.io.*; +import javax.swing.*; /** diff --git a/src/eva2/gui/JExtDesktopPaneToolBar.java b/src/eva2/gui/JExtDesktopPaneToolBar.java index 8b72d495..44058a78 100644 --- a/src/eva2/gui/JExtDesktopPaneToolBar.java +++ b/src/eva2/gui/JExtDesktopPaneToolBar.java @@ -1,10 +1,10 @@ package eva2.gui; -import javax.swing.JToolBar; import eva2.tools.ToolBoxGui; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.JButton; +import javax.swing.JToolBar; import javax.swing.SwingConstants; /** diff --git a/src/eva2/gui/JExtMenu.java b/src/eva2/gui/JExtMenu.java index 5cdc31d9..105c7ec2 100644 --- a/src/eva2/gui/JExtMenu.java +++ b/src/eva2/gui/JExtMenu.java @@ -12,12 +12,12 @@ package eva2.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ +import java.beans.*; +import javax.swing.Action; +import javax.swing.Icon; import javax.swing.JMenu; import javax.swing.JMenuItem; import javax.swing.KeyStroke; -import javax.swing.Icon; -import javax.swing.Action; -import java.beans.*; /** * */ diff --git a/src/eva2/gui/LoggingPanel.java b/src/eva2/gui/LoggingPanel.java index 4c65456c..77a68b9e 100644 --- a/src/eva2/gui/LoggingPanel.java +++ b/src/eva2/gui/LoggingPanel.java @@ -10,24 +10,17 @@ package eva2.gui; * $Author: mkron $ */ import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Point; +import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.Date; - -import javax.swing.BorderFactory; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.JViewport; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - -import java.awt.Color; -import java.text.MessageFormat; import java.util.logging.Handler; import java.util.logging.LogRecord; import java.util.logging.Logger; import javax.swing.*; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; /** * diff --git a/src/eva2/gui/Plot.java b/src/eva2/gui/Plot.java index 8290974f..11a25b07 100644 --- a/src/eva2/gui/Plot.java +++ b/src/eva2/gui/Plot.java @@ -6,11 +6,12 @@ package eva2.gui; * Hannes Planatscher @version: $Revision: 322 $ $Date: 2007-12-11 17:24:07 * +0100 (Tue, 11 Dec 2007) $ $Author: mkron $ */ -import java.awt.AWTException; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Rectangle; -import java.awt.Robot; +import eva2.EvAInfo; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.tools.BasicResourceLoader; +import eva2.tools.chart2d.DPointSet; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.image.BufferedImage; @@ -25,19 +26,7 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Formatter; import java.util.Locale; - import javax.imageio.ImageIO; -import javax.swing.JButton; -import javax.swing.JFileChooser; -import javax.swing.JOptionPane; -import javax.swing.JPanel; - -import eva2.EvAInfo; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.tools.BasicResourceLoader; -import eva2.tools.chart2d.DPointSet; -import java.awt.*; import javax.swing.*; import javax.swing.event.InternalFrameAdapter; import javax.swing.event.InternalFrameEvent; diff --git a/src/eva2/gui/PropertyDialog.java b/src/eva2/gui/PropertyDialog.java index 1f397bdb..77a46786 100644 --- a/src/eva2/gui/PropertyDialog.java +++ b/src/eva2/gui/PropertyDialog.java @@ -5,13 +5,12 @@ package eva2.gui; * $Date: 2006-12-18 16:32:23 +0100 (Mon, 18 Dec 2006) $ $Author: marcekro $ */ -import java.awt.BorderLayout; -import java.awt.Component; -import java.beans.PropertyEditor; - import eva2.EvAInfo; import eva2.tools.BasicResourceLoader; import eva2.tools.EVAHELP; +import java.awt.BorderLayout; +import java.awt.Component; +import java.beans.PropertyEditor; import javax.swing.JDialog; /** diff --git a/src/eva2/gui/PropertySheetPanelStat.java b/src/eva2/gui/PropertySheetPanelStat.java index c0539ddc..305a5b27 100644 --- a/src/eva2/gui/PropertySheetPanelStat.java +++ b/src/eva2/gui/PropertySheetPanelStat.java @@ -19,7 +19,6 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.beans.PropertyChangeSupport; import java.io.Serializable; - import javax.swing.BorderFactory; import javax.swing.JCheckBox; import javax.swing.JLabel; diff --git a/src/eva2/server/go/GOStandaloneVersion.java b/src/eva2/server/go/GOStandaloneVersion.java index db6c0ac6..fa9e7aba 100644 --- a/src/eva2/server/go/GOStandaloneVersion.java +++ b/src/eva2/server/go/GOStandaloneVersion.java @@ -2,7 +2,6 @@ package eva2.server.go; import eva2.gui.BeanInspector; import eva2.gui.JParaPanel; -import eva2.server.go.SwingWorker; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.ESIndividualDoubleData; import eva2.server.go.individuals.GAIndividualDoubleData; diff --git a/src/eva2/server/go/MOCCOStandalone.java b/src/eva2/server/go/MOCCOStandalone.java index f1538252..72c60802 100644 --- a/src/eva2/server/go/MOCCOStandalone.java +++ b/src/eva2/server/go/MOCCOStandalone.java @@ -2,7 +2,6 @@ package eva2.server.go; import eva2.gui.JParaPanel; import eva2.gui.PropertyDoubleArray; -import eva2.server.go.SwingWorker; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.mocco.*; import eva2.server.go.mocco.paretofrontviewer.MOCCOViewer; diff --git a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java index a406aec6..afd8a665 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java @@ -1,8 +1,6 @@ package eva2.server.go.mocco.paretofrontviewer; -import javax.swing.*; - import eva2.gui.*; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; @@ -12,11 +10,10 @@ import eva2.tools.chart2d.Chart2DDPointContentSelectable; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.ScaledBorder; - - import java.awt.*; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import javax.swing.*; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/cluster/ClusteringNearestBetter.java b/src/eva2/server/go/operators/cluster/ClusteringNearestBetter.java index 0180466e..ddca621a 100644 --- a/src/eva2/server/go/operators/cluster/ClusteringNearestBetter.java +++ b/src/eva2/server/go/operators/cluster/ClusteringNearestBetter.java @@ -1,10 +1,5 @@ package eva2.server.go.operators.cluster; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.Vector; - import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; import eva2.server.go.individuals.AbstractEAIndividual; @@ -14,6 +9,10 @@ import eva2.server.go.operators.distancemetric.PhenotypeMetric; import eva2.server.go.operators.paramcontrol.ParamAdaption; import eva2.server.go.operators.paramcontrol.ParameterControlManager; import eva2.server.go.populations.Population; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.Vector; /** * Hierarchical clustering after Preuss et al., "Counteracting Genetic Drift and Disruptive Recombination diff --git a/src/eva2/server/go/operators/constraint/GenericConstraint.java b/src/eva2/server/go/operators/constraint/GenericConstraint.java index abc30ed4..75409d4c 100644 --- a/src/eva2/server/go/operators/constraint/GenericConstraint.java +++ b/src/eva2/server/go/operators/constraint/GenericConstraint.java @@ -1,10 +1,9 @@ package eva2.server.go.operators.constraint; -import java.io.Serializable; - import eva2.server.go.individuals.codings.gp.AbstractGPNode; import eva2.server.go.problems.GPFunctionProblem; import eva2.tools.EVAERROR; +import java.io.Serializable; /** * A generic constraint is defined by a String describing a function of the x0...xn values of potential solutions. diff --git a/src/eva2/server/go/operators/constraint/IntervalConstraint.java b/src/eva2/server/go/operators/constraint/IntervalConstraint.java index 291a6fa4..abd6c8ed 100644 --- a/src/eva2/server/go/operators/constraint/IntervalConstraint.java +++ b/src/eva2/server/go/operators/constraint/IntervalConstraint.java @@ -1,10 +1,9 @@ package eva2.server.go.operators.constraint; -import java.io.Serializable; - import eva2.gui.GenericObjectEditor; import eva2.tools.EVAERROR; import eva2.tools.math.Mathematics; +import java.io.Serializable; /** * A constraint for a parameter or a generic function to lie within certain bounds. diff --git a/src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java b/src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java index 285aeee6..30a2fa24 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java +++ b/src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java @@ -2,7 +2,6 @@ package eva2.server.go.operators.crossover; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceOBGAIndividual; -import eva2.server.go.operators.crossover.InterfaceCrossover; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/crossover/TestESCrossover.java b/src/eva2/server/go/operators/crossover/TestESCrossover.java index 1b674e04..282338c4 100644 --- a/src/eva2/server/go/operators/crossover/TestESCrossover.java +++ b/src/eva2/server/go/operators/crossover/TestESCrossover.java @@ -1,8 +1,6 @@ package eva2.server.go.operators.crossover; -import javax.swing.*; - import eva2.gui.JParaPanel; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; @@ -11,12 +9,12 @@ import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.server.go.populations.Population; import eva2.server.go.problems.F1Problem; import eva2.server.go.problems.InterfaceOptimizationProblem; - +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import java.awt.*; +import javax.swing.*; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/distancemetric/IndividualDataMetric.java b/src/eva2/server/go/operators/distancemetric/IndividualDataMetric.java index 1dcd5de0..0cefede5 100644 --- a/src/eva2/server/go/operators/distancemetric/IndividualDataMetric.java +++ b/src/eva2/server/go/operators/distancemetric/IndividualDataMetric.java @@ -1,10 +1,9 @@ package eva2.server.go.operators.distancemetric; -import java.io.Serializable; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.strategies.ParticleSwarmOptimization; import eva2.tools.EVAERROR; +import java.io.Serializable; /** * Define a metric on data stored within individuals, such as the personal best position diff --git a/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java b/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java index 1b4cdb64..1d576cb2 100644 --- a/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java +++ b/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java @@ -2,8 +2,6 @@ package eva2.server.go.operators.distancemetric; -import java.util.BitSet; - import eva2.gui.BeanInspector; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceDataTypeBinary; @@ -11,6 +9,7 @@ import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.server.go.individuals.InterfaceDataTypeInteger; import eva2.server.go.individuals.InterfaceDataTypePermutation; import eva2.server.go.individuals.InterfaceDataTypeProgram; +import java.util.BitSet; /** * A phenotype metric suited for the most common data types. diff --git a/src/eva2/server/go/operators/initialization/GAGIInitializeSegmentwise.java b/src/eva2/server/go/operators/initialization/GAGIInitializeSegmentwise.java index e74aba1d..cedfc2a9 100644 --- a/src/eva2/server/go/operators/initialization/GAGIInitializeSegmentwise.java +++ b/src/eva2/server/go/operators/initialization/GAGIInitializeSegmentwise.java @@ -1,13 +1,12 @@ package eva2.server.go.operators.initialization; -import java.util.BitSet; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceGAIndividual; import eva2.server.go.individuals.InterfaceGIIndividual; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; +import java.util.BitSet; /** * An initialization method which sets a fixed number of specified target elements per segment, diff --git a/src/eva2/server/go/operators/migration/MOXMeansSeparation.java b/src/eva2/server/go/operators/migration/MOXMeansSeparation.java index 3a9aa175..f24d7753 100644 --- a/src/eva2/server/go/operators/migration/MOXMeansSeparation.java +++ b/src/eva2/server/go/operators/migration/MOXMeansSeparation.java @@ -1,8 +1,6 @@ package eva2.server.go.operators.migration; -import java.io.*; - import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; @@ -18,6 +16,7 @@ import eva2.server.go.strategies.InterfaceOptimizer; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; +import java.io.*; /** This method implements the clustering based subdivision * scheme suited to identify uni- and multi-modal search spaces diff --git a/src/eva2/server/go/operators/mutation/MutateESCorrVector.java b/src/eva2/server/go/operators/mutation/MutateESCorrVector.java index 8ffe7732..3b3d1fa1 100644 --- a/src/eva2/server/go/operators/mutation/MutateESCorrVector.java +++ b/src/eva2/server/go/operators/mutation/MutateESCorrVector.java @@ -1,7 +1,5 @@ package eva2.server.go.operators.mutation; -import java.util.ArrayList; - import eva2.gui.BeanInspector; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceESIndividual; @@ -9,6 +7,7 @@ import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; +import java.util.ArrayList; /** diff --git a/src/eva2/server/go/operators/mutation/MutateESGlobal.java b/src/eva2/server/go/operators/mutation/MutateESGlobal.java index f85a2f0a..557e0bc9 100644 --- a/src/eva2/server/go/operators/mutation/MutateESGlobal.java +++ b/src/eva2/server/go/operators/mutation/MutateESGlobal.java @@ -1,7 +1,5 @@ package eva2.server.go.operators.mutation; -import java.util.ArrayList; - import eva2.server.go.PopulationInterface; import eva2.server.go.enums.MutateESCrossoverTypeEnum; import eva2.server.go.individuals.AbstractEAIndividual; @@ -10,6 +8,7 @@ import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; +import java.util.ArrayList; /** diff --git a/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java b/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java index f4b03b0e..b0af3415 100644 --- a/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java +++ b/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java @@ -1,8 +1,6 @@ package eva2.server.go.operators.mutation; -import java.util.ArrayList; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceGPIndividual; import eva2.server.go.individuals.codings.gp.AbstractGPNode; @@ -10,6 +8,7 @@ import eva2.server.go.individuals.codings.gp.GPArea; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; +import java.util.ArrayList; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/paramcontrol/PSOInertnessAdaption.java b/src/eva2/server/go/operators/paramcontrol/PSOInertnessAdaption.java index 7a5dec22..b99e45d6 100644 --- a/src/eva2/server/go/operators/paramcontrol/PSOInertnessAdaption.java +++ b/src/eva2/server/go/operators/paramcontrol/PSOInertnessAdaption.java @@ -1,8 +1,7 @@ package eva2.server.go.operators.paramcontrol; -import java.io.Serializable; - import eva2.gui.GenericObjectEditor; +import java.io.Serializable; /** * Adapt PSO inertness linearly by time, from given start to end value. diff --git a/src/eva2/server/go/operators/paramcontrol/SinusoidalParamAdaption.java b/src/eva2/server/go/operators/paramcontrol/SinusoidalParamAdaption.java index 3168dd30..0a3a2f90 100644 --- a/src/eva2/server/go/operators/paramcontrol/SinusoidalParamAdaption.java +++ b/src/eva2/server/go/operators/paramcontrol/SinusoidalParamAdaption.java @@ -1,8 +1,7 @@ package eva2.server.go.operators.paramcontrol; -import java.io.Serializable; - import eva2.server.go.populations.Population; +import java.io.Serializable; /** * A sinusoidal adaption scheme which can be dampened. The value oscillates between a lower and an upper diff --git a/src/eva2/server/go/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java b/src/eva2/server/go/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java index 5ef040d9..77f9ec4b 100644 --- a/src/eva2/server/go/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java @@ -1,12 +1,11 @@ package eva2.server.go.operators.selection.replacement; -import java.util.Collections; -import java.util.Comparator; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.archiving.ArchivingNSGAII; import eva2.server.go.operators.selection.SelectRandom; import eva2.server.go.populations.Population; +import java.util.Collections; +import java.util.Comparator; /** This crowding method replaces the most similar individual from a random group if better. diff --git a/src/eva2/server/go/operators/terminators/PopulationMeasureTerminator.java b/src/eva2/server/go/operators/terminators/PopulationMeasureTerminator.java index 3f4fef1e..cd3c7e99 100644 --- a/src/eva2/server/go/operators/terminators/PopulationMeasureTerminator.java +++ b/src/eva2/server/go/operators/terminators/PopulationMeasureTerminator.java @@ -1,12 +1,11 @@ package eva2.server.go.operators.terminators; -import java.io.Serializable; - import eva2.gui.BeanInspector; import eva2.server.go.InterfaceTerminator; import eva2.server.go.PopulationInterface; import eva2.server.go.populations.InterfaceSolutionSet; import eva2.server.go.problems.InterfaceOptimizationProblem; +import java.io.Serializable; /** * Abstract class giving the framework for a terminator that is based on diff --git a/src/eva2/server/go/problems/ConstrPressureVessel.java b/src/eva2/server/go/problems/ConstrPressureVessel.java index 1f11e479..2e45ee78 100644 --- a/src/eva2/server/go/problems/ConstrPressureVessel.java +++ b/src/eva2/server/go/problems/ConstrPressureVessel.java @@ -1,7 +1,5 @@ package eva2.server.go.problems; -import java.util.Vector; - import eva2.gui.GenericObjectEditor; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.constraint.AbstractConstraint; @@ -9,6 +7,7 @@ import eva2.server.go.operators.constraint.ConstraintCollection; import eva2.server.go.operators.constraint.ConstraintHandlingEnum; import eva2.server.go.operators.constraint.ConstraintRelationEnum; import eva2.server.go.operators.constraint.GenericConstraint; +import java.util.Vector; public class ConstrPressureVessel extends AbstractProblemDouble { private boolean discreteThickness = true; diff --git a/src/eva2/server/go/problems/FLensProblem.java b/src/eva2/server/go/problems/FLensProblem.java index 761ae917..9bdc4e58 100644 --- a/src/eva2/server/go/problems/FLensProblem.java +++ b/src/eva2/server/go/problems/FLensProblem.java @@ -1,6 +1,14 @@ package eva2.server.go.problems; +import eva2.server.go.GOStandaloneVersion; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.populations.Population; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.modules.GOParameters; +import eva2.tools.math.RNG; import java.awt.BasicStroke; import java.awt.BorderLayout; import java.awt.Color; @@ -11,22 +19,12 @@ import java.awt.Rectangle; import java.awt.Shape; import java.awt.Stroke; import java.awt.image.BufferedImage; - import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; -import eva2.server.go.GOStandaloneVersion; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.modules.GOParameters; -import eva2.tools.math.RNG; - class MyLensViewer extends JPanel implements InterfaceSolutionViewer { /** diff --git a/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java b/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java index 8d57fa1d..5b1f450f 100644 --- a/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java +++ b/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java @@ -1,8 +1,5 @@ package eva2.server.go.problems; -import eva2.server.go.problems.InterfaceOptimizationObjective; - - import eva2.server.go.mocco.paretofrontviewer.InterfaceParetoFrontView; import eva2.server.go.mocco.paretofrontviewer.MOCCOViewer; diff --git a/src/eva2/server/go/strategies/BOA.java b/src/eva2/server/go/strategies/BOA.java index 82113278..a04c83c7 100644 --- a/src/eva2/server/go/strategies/BOA.java +++ b/src/eva2/server/go/strategies/BOA.java @@ -1,16 +1,5 @@ package eva2.server.go.strategies; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.Writer; -import java.text.DateFormat; -import java.util.BitSet; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; - import eva2.gui.BeanInspector; import eva2.server.go.InterfacePopulationChangedEventListener; import eva2.server.go.enums.BOAScoringMethods; @@ -28,6 +17,16 @@ import eva2.tools.Pair; import eva2.tools.math.BayNet; import eva2.tools.math.RNG; import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Writer; +import java.text.DateFormat; +import java.util.BitSet; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/eva2/server/go/strategies/LTGA.java b/src/eva2/server/go/strategies/LTGA.java index a3040bc3..3e1ce14f 100644 --- a/src/eva2/server/go/strategies/LTGA.java +++ b/src/eva2/server/go/strategies/LTGA.java @@ -1,12 +1,5 @@ package eva2.server.go.strategies; -import java.util.BitSet; -import java.util.HashSet; -import java.util.Set; -import java.util.Stack; -import java.util.logging.Level; -import java.util.logging.Logger; - import eva2.gui.BeanInspector; import eva2.server.go.InterfacePopulationChangedEventListener; import eva2.server.go.individuals.AbstractEAIndividual; @@ -20,6 +13,12 @@ import eva2.server.go.problems.BKnapsackProblem; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; import eva2.tools.math.SpecialFunction; +import java.util.BitSet; +import java.util.HashSet; +import java.util.Set; +import java.util.Stack; +import java.util.logging.Level; +import java.util.logging.Logger; public class LTGA implements InterfaceOptimizer, java.io.Serializable, InterfacePopulationChangedEventListener { diff --git a/src/eva2/server/go/strategies/MLTGA.java b/src/eva2/server/go/strategies/MLTGA.java index 50d1a770..a0e357bf 100644 --- a/src/eva2/server/go/strategies/MLTGA.java +++ b/src/eva2/server/go/strategies/MLTGA.java @@ -1,12 +1,5 @@ package eva2.server.go.strategies; -import java.util.BitSet; -import java.util.HashSet; -import java.util.Set; -import java.util.Stack; -import java.util.logging.Level; -import java.util.logging.Logger; - import eva2.gui.BeanInspector; import eva2.server.go.InterfacePopulationChangedEventListener; import eva2.server.go.individuals.AbstractEAIndividual; @@ -20,6 +13,12 @@ import eva2.server.go.problems.BKnapsackProblem; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; import eva2.tools.math.SpecialFunction; +import java.util.BitSet; +import java.util.HashSet; +import java.util.Set; +import java.util.Stack; +import java.util.logging.Level; +import java.util.logging.Logger; public class MLTGA implements InterfaceOptimizer, java.io.Serializable, InterfacePopulationChangedEventListener { diff --git a/src/eva2/server/go/strategies/ParticleSwarmOptimizationGCPSO.java b/src/eva2/server/go/strategies/ParticleSwarmOptimizationGCPSO.java index dfe1d5dd..801f1681 100644 --- a/src/eva2/server/go/strategies/ParticleSwarmOptimizationGCPSO.java +++ b/src/eva2/server/go/strategies/ParticleSwarmOptimizationGCPSO.java @@ -1,7 +1,7 @@ package eva2.server.go.strategies; -import eva2.tools.math.RNG; import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.tools.math.RNG; /** * This extends the particle swarm optimization implementation diff --git a/src/eva2/server/go/tools/FileTools.java b/src/eva2/server/go/tools/FileTools.java index 129130c1..9e560e53 100644 --- a/src/eva2/server/go/tools/FileTools.java +++ b/src/eva2/server/go/tools/FileTools.java @@ -1,5 +1,8 @@ package eva2.server.go.tools; +import eva2.gui.BeanInspector; +import eva2.tools.BasicResourceLoader; +import eva2.tools.StringTools; import java.awt.Component; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -13,14 +16,9 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.PrintWriter; import java.util.ArrayList; - import javax.swing.JFileChooser; import javax.swing.JOptionPane; -import eva2.gui.BeanInspector; -import eva2.tools.BasicResourceLoader; -import eva2.tools.StringTools; - /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/tools/GeneralGenericObjectEditorPanel.java b/src/eva2/server/go/tools/GeneralGenericObjectEditorPanel.java index e0f80e0e..21bc84ae 100644 --- a/src/eva2/server/go/tools/GeneralGenericObjectEditorPanel.java +++ b/src/eva2/server/go/tools/GeneralGenericObjectEditorPanel.java @@ -1,20 +1,18 @@ package eva2.server.go.tools; -import javax.swing.*; - import eva2.gui.GenericObjectEditor; import eva2.tools.EVAHELP; - -import java.awt.event.ItemListener; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import java.awt.event.ItemEvent; import java.awt.*; -import java.util.ArrayList; -import java.beans.PropertyChangeListener; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.io.*; +import java.util.ArrayList; +import javax.swing.*; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/modules/AbstractGOParameters.java b/src/eva2/server/modules/AbstractGOParameters.java index 0f4ab896..f3f34343 100644 --- a/src/eva2/server/modules/AbstractGOParameters.java +++ b/src/eva2/server/modules/AbstractGOParameters.java @@ -1,9 +1,5 @@ package eva2.server.modules; -import java.io.Serializable; -import java.util.LinkedList; -import java.util.List; - import eva2.gui.BeanInspector; import eva2.server.go.InterfaceGOParameters; import eva2.server.go.InterfaceNotifyOnInformers; @@ -17,6 +13,9 @@ import eva2.server.go.strategies.InterfaceOptimizer; import eva2.tools.Serializer; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.Serializable; +import java.util.LinkedList; +import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/eva2/server/modules/AbstractModuleAdapter.java b/src/eva2/server/modules/AbstractModuleAdapter.java index 696443fa..782322f7 100644 --- a/src/eva2/server/modules/AbstractModuleAdapter.java +++ b/src/eva2/server/modules/AbstractModuleAdapter.java @@ -9,13 +9,12 @@ package eva2.server.modules; * $Date: 2007-12-04 14:22:52 +0100 (Tue, 04 Dec 2007) $ * $Author: mkron $ */ -import java.io.Serializable; -import java.net.InetAddress; - import eva2.server.go.InterfaceGOParameters; import eva2.server.go.InterfaceProcessor; import eva2.tools.jproxy.MainAdapterClient; import eva2.tools.jproxy.RemoteStateListener; +import java.io.Serializable; +import java.net.InetAddress; import java.util.ArrayList; import java.util.List; diff --git a/src/eva2/server/modules/DEParameters.java b/src/eva2/server/modules/DEParameters.java index 17cb9094..440cc35b 100644 --- a/src/eva2/server/modules/DEParameters.java +++ b/src/eva2/server/modules/DEParameters.java @@ -1,8 +1,6 @@ package eva2.server.modules; -import java.io.Serializable; - import eva2.server.go.InterfaceGOParameters; import eva2.server.go.enums.DETypeEnum; import eva2.server.go.operators.terminators.EvaluationTerminator; @@ -13,6 +11,7 @@ import eva2.server.go.strategies.InterfaceOptimizer; import eva2.tools.Serializer; import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.Serializable; import java.util.logging.Level; /** The class gives access to all DE parameters for the EvA diff --git a/src/eva2/server/stat/EvAJobList.java b/src/eva2/server/stat/EvAJobList.java index 8c088ebd..0e5b21cb 100644 --- a/src/eva2/server/stat/EvAJobList.java +++ b/src/eva2/server/stat/EvAJobList.java @@ -1,19 +1,5 @@ package eva2.server.stat; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.beans.PropertyEditor; -import java.io.File; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -import javax.swing.JComponent; -import javax.swing.JFileChooser; -import javax.swing.JOptionPane; - import eva2.gui.GenericArrayEditor; import eva2.gui.JParaPanel; import eva2.gui.PropertySelectableList; @@ -24,6 +10,18 @@ import eva2.server.modules.AbstractModuleAdapter; import eva2.server.modules.GenericModuleAdapter; import eva2.server.modules.ModuleAdapter; import eva2.tools.Serializer; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.beans.PropertyEditor; +import java.io.File; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import javax.swing.JComponent; +import javax.swing.JFileChooser; +import javax.swing.JOptionPane; /** * A selectable list of EvAJobs. Each job contains a GOParameters instance and potentially diff --git a/src/eva2/server/stat/StatisticsWithGUI.java b/src/eva2/server/stat/StatisticsWithGUI.java index 153ca3b1..f3ade91e 100644 --- a/src/eva2/server/stat/StatisticsWithGUI.java +++ b/src/eva2/server/stat/StatisticsWithGUI.java @@ -13,11 +13,6 @@ package eva2.server.stat; /*==========================================================================* * IMPORTS *==========================================================================*/ -import java.io.Serializable; -import java.net.InetAddress; -import java.util.ArrayList; -import java.util.List; - import eva2.gui.BeanInspector; import eva2.gui.Graph; import eva2.gui.GraphWindow; @@ -32,6 +27,10 @@ import eva2.tools.Pair; import eva2.tools.jproxy.MainAdapterClient; import eva2.tools.jproxy.RMIProxyLocal; import eva2.tools.jproxy.RMIProxyRemote; +import java.io.Serializable; +import java.net.InetAddress; +import java.util.ArrayList; +import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/eva2/tools/print/PagePrinter.java b/src/eva2/tools/print/PagePrinter.java index 5ffa469a..797c2ce4 100644 --- a/src/eva2/tools/print/PagePrinter.java +++ b/src/eva2/tools/print/PagePrinter.java @@ -16,7 +16,7 @@ package eva2.tools.print; * IMPORTS *==========================================================================*/ -import java.awt.* ; +import java.awt.*; import java.awt.image.BufferedImage; import java.awt.print.*; import javax.swing.*; diff --git a/test/eva2/tools/SerializerTest.java b/test/eva2/tools/SerializerTest.java index aab4e77f..b31fd39f 100644 --- a/test/eva2/tools/SerializerTest.java +++ b/test/eva2/tools/SerializerTest.java @@ -5,9 +5,9 @@ package eva2.tools; import java.io.*; +import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; /** *