From 736ada351783a9904e0a027937a821ad654710d3 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Tue, 29 Jan 2013 13:46:28 +0000 Subject: [PATCH] refs #25, #24 More refactoring.. refactor all the things :/ --- src/eva2/client/EvAClient.java | 1 + src/eva2/client/RMIConnectionEvA.java | 5 +- src/eva2/examples/TerminatorExample.java | 4 +- src/eva2/examples/TestingF1PSO.java | 4 +- src/eva2/examples/TestingGAB1.java | 6 +- src/eva2/gui/AboutDialog.java | 4 - src/eva2/gui/AbstractListSelectionEditor.java | 1 - src/eva2/gui/BeanInspector.java | 21 ++- src/eva2/gui/BigStringEditor.java | 2 - src/eva2/gui/DPointSetMultiIcon.java | 11 +- src/eva2/gui/DataViewer.java | 5 +- src/eva2/gui/EnumEditor.java | 5 +- src/eva2/gui/EvAModuleButtonPanelMaker.java | 1 - src/eva2/gui/EvATreeSelectionListener.java | 1 - src/eva2/gui/ExtAction.java | 2 +- src/eva2/gui/ExtActionChangedListener.java | 2 +- src/eva2/gui/FunctionArea.java | 36 ++-- src/eva2/gui/GenericDoubleArrayEditor.java | 1 - .../gui/GenericEpsilonConstraintEditor.java | 12 +- .../gui/GenericEpsilonThresholdEditor.java | 12 +- src/eva2/gui/GenericIntArrayEditor.java | 12 +- src/eva2/gui/GenericObjectEditor.java | 7 +- .../GenericOptimizationObjectivesEditor.java | 5 +- ...OptimizationObjectivesWithParamEditor.java | 16 +- src/eva2/gui/GenericRemoteServersEditor.java | 7 +- .../GenericWeigthedLPTchebycheffEditor.java | 8 +- src/eva2/gui/GraphPointSet.java | 14 +- src/eva2/gui/GraphPointSetLegend.java | 8 +- src/eva2/gui/GraphWindow.java | 5 +- src/eva2/gui/JExtDesktopPane.java | 2 - src/eva2/gui/JExtDesktopPaneToolBar.java | 1 - src/eva2/gui/JExtFileChooser.java | 2 +- src/eva2/gui/JExtMenu.java | 1 - src/eva2/gui/JTextEditorInternalFrame.java | 12 +- src/eva2/gui/LoggingLevelLabel.java | 1 - src/eva2/gui/LoggingPanel.java | 9 - src/eva2/gui/MultiLineStringEditor.java | 2 +- src/eva2/gui/Plot.java | 4 - src/eva2/gui/PropertyBoolSelector.java | 1 - src/eva2/gui/PropertyDialog.java | 2 - src/eva2/gui/PropertyDoubleArray.java | 27 ++- src/eva2/gui/PropertyEditorProvider.java | 7 +- ...opertyOptimizationObjectivesWithParam.java | 12 +- src/eva2/gui/PropertyPanel.java | 2 - src/eva2/gui/PropertyRemoteServers.java | 3 +- src/eva2/gui/PropertySheetPanelStat.java | 2 - src/eva2/gui/StatisticsEditor.java | 7 +- src/eva2/gui/TagEditor.java | 10 +- src/eva2/gui/TopoPlot.java | 10 +- src/eva2/gui/utils/CustomTabbedPaneUI.java | 6 +- src/eva2/server/ModuleServer.java | 2 +- src/eva2/server/go/GOStandaloneVersion.java | 13 +- .../server/go/InterfaceNotifyOnInformers.java | 3 +- src/eva2/server/go/MOCCOStandalone.java | 2 +- .../individuals/ESIndividualBinaryData.java | 11 +- .../individuals/ESIndividualIntegerData.java | 8 +- .../ESIndividualPermutationData.java | 8 +- .../GAESIndividualBinaryDoubleData.java | 15 +- .../individuals/GAIndividualBinaryData.java | 24 +-- .../individuals/GAIndividualDoubleData.java | 11 +- .../individuals/GAIndividualIntegerData.java | 27 ++- .../individuals/GAPIndividualProgramData.java | 12 +- .../individuals/GEIndividualProgramData.java | 25 ++- .../individuals/GIIndividualIntegerData.java | 8 +- ...IOBGAIndividualIntegerPermutationData.java | 12 +- .../individuals/GPIndividualProgramData.java | 15 +- .../IndividualDistanceComparator.java | 3 +- .../IndividualWeightedFitnessComparator.java | 3 +- .../OBGAIndividualPermutationData.java | 11 +- .../codings/ga/GAGrayCodingDouble.java | 7 +- .../codings/ga/GAGrayCodingInteger.java | 4 +- .../codings/ga/GAStandardCodingDouble.java | 2 +- .../codings/ga/GAStandardCodingInteger.java | 7 +- .../codings/gp/AbstractGPNode.java | 31 ++-- .../go/individuals/codings/gp/GPArea.java | 3 +- .../go/individuals/codings/gp/GPNodeAdd.java | 1 - .../go/individuals/codings/gp/GPNodeDiv.java | 2 +- .../go/individuals/codings/gp/GPNodeMult.java | 2 +- .../go/individuals/codings/gp/GPNodeProd.java | 4 +- .../go/individuals/codings/gp/GPNodeSum.java | 4 +- .../go/mocco/MOCCOChooseMOStrategy.java | 6 +- .../go/mocco/MOCCOChooseReferencePoint.java | 6 +- .../mocco/MOCCOChooseReferenceSolution.java | 6 +- .../server/go/mocco/MOCCOParameterizeGDF.java | 10 +- .../server/go/mocco/MOCCOParameterizeMO.java | 6 +- .../go/mocco/MOCCOParameterizeRefPoint.java | 20 +-- .../server/go/mocco/MOCCOParameterizeSO.java | 20 +-- .../go/mocco/MOCCOParameterizeSTEP.java | 30 ++-- .../mocco/MOCCOParameterizeTchebycheff.java | 28 ++-- .../go/mocco/MOCCOProblemRedefinition.java | 6 +- src/eva2/server/go/mocco/MOCCOState.java | 4 +- .../mocco/paretofrontviewer/MOCCOViewer.java | 46 +++-- .../paretofrontviewer/ParetoFrontView2D.java | 6 +- .../ParetoFrontViewScatterPlot.java | 1 - .../archiving/AbstractArchiving.java | 4 +- .../operators/archiving/ArchivingNSGAII.java | 7 +- .../operators/archiving/ArchivingSPEAII.java | 12 +- .../ClassificationSelfOrganizingMaps.java | 10 +- .../go/operators/cluster/ClusterAll.java | 3 +- .../cluster/ClusteringDensityBased.java | 11 +- .../cluster/ClusteringDynPeakIdent.java | 7 +- .../operators/cluster/ClusteringKMeans.java | 10 +- .../cluster/ClusteringNearestBetter.java | 9 +- .../operators/cluster/ClusteringXMeans.java | 13 +- .../constraint/GenericConstraint.java | 1 - .../constraint/InterfaceDoubleConstraint.java | 2 - .../constraint/IntervalConstraint.java | 1 - .../crossover/AdaptiveCrossoverEAMixer.java | 12 +- .../server/go/operators/crossover/CM1.java | 3 +- .../server/go/operators/crossover/CM3.java | 5 +- .../server/go/operators/crossover/CM4.java | 5 +- .../server/go/operators/crossover/CM5.java | 3 +- .../server/go/operators/crossover/CM6.java | 3 +- .../server/go/operators/crossover/CM7.java | 3 +- .../operators/crossover/CrossoverEAMixer.java | 9 +- .../crossover/CrossoverESArithmetical.java | 12 +- .../crossover/CrossoverESBLXAlpha.java | 8 +- .../crossover/CrossoverESDefault.java | 8 +- .../operators/crossover/CrossoverESFlat.java | 8 +- .../crossover/CrossoverESIntermediate.java | 18 +- .../crossover/CrossoverESNPointDiscrete.java | 8 +- .../CrossoverESNPointDiscreteDislocation.java | 8 +- .../operators/crossover/CrossoverESPCX.java | 13 +- .../operators/crossover/CrossoverESSBX.java | 8 +- .../operators/crossover/CrossoverESSPX.java | 8 +- .../operators/crossover/CrossoverESUNDX.java | 19 ++- .../crossover/CrossoverESUniformDiscrete.java | 8 +- .../crossover/CrossoverGABitSimulated.java | 17 +- .../crossover/CrossoverGADefault.java | 17 +- .../crossover/CrossoverGAGINPoint.java | 3 +- .../crossover/CrossoverGAUniform.java | 11 +- .../crossover/CrossoverGIDefault.java | 8 +- .../crossover/CrossoverGINPoint.java | 8 +- .../crossover/CrossoverGINPointVL.java | 4 +- .../crossover/CrossoverGIUniform.java | 9 +- .../crossover/CrossoverGPDefault.java | 13 +- .../operators/crossover/CrossoverOBGAPMX.java | 9 +- .../crossover/CrossoverOBGAPMXUniform.java | 9 +- .../go/operators/crossover/NoCrossover.java | 4 +- .../crossover/PropertyCrossoverMixer.java | 22 ++- .../PropertyCrossoverMixerEditor.java | 18 +- .../operators/crossover/TestESCrossover.java | 1 - .../distancemetric/EuclideanMetric.java | 3 +- .../distancemetric/IndividualDataMetric.java | 1 - .../distancemetric/ObjectiveSpaceMetric.java | 1 - .../distancemetric/PhenotypeMetric.java | 19 ++- .../FitnessAdaptiveClustering.java | 6 +- .../fitnessmodifier/FitnessSharing.java | 6 +- .../GAGIInitializeSegmentwise.java | 2 - .../operators/migration/MOBestMigration.java | 1 - .../migration/MOXMeansSeparation.java | 2 - .../operators/migration/SOMONoMigration.java | 3 - .../moso/MOSODynamicallyWeightedFitness.java | 3 +- .../operators/moso/MOSOEpsilonConstraint.java | 4 +- .../operators/moso/MOSOEpsilonThreshold.java | 9 +- .../operators/moso/MOSOGoalProgramming.java | 15 +- .../go/operators/moso/MOSOLpMetric.java | 12 +- .../go/operators/moso/MOSOMOGARankBased.java | 4 +- .../go/operators/moso/MOSONoConvert.java | 1 - .../go/operators/moso/MOSORandomWeight.java | 12 +- .../operators/moso/MOSOWeightedFitness.java | 19 ++- .../moso/MOSOWeightedLPTchebycheff.java | 8 +- .../go/operators/mutation/CMAParamSet.java | 4 +- .../go/operators/mutation/MutateDefault.java | 1 - .../go/operators/mutation/MutateEAMixer.java | 9 +- .../mutation/MutateESCorrVector.java | 5 +- .../mutation/MutateESCorrolated.java | 12 +- .../MutateESCovarianceMatrixAdaption.java | 23 ++- .../MutateESCovarianceMatrixAdaptionPlus.java | 7 +- .../go/operators/mutation/MutateESGlobal.java | 13 +- .../go/operators/mutation/MutateESLocal.java | 23 ++- .../mutation/MutateESMainVectorAdaption.java | 24 ++- .../MutateESMutativeStepSizeControl.java | 4 +- .../mutation/MutateESPathLengthAdaption.java | 19 ++- .../operators/mutation/MutateESRankMuCMA.java | 60 ++++--- .../mutation/MutateESSuccessRule.java | 9 +- .../operators/mutation/MutateGAAdaptive.java | 5 +- .../MutateGAGISwapBitsSegmentwise.java | 3 +- .../mutation/MutateGAShiftSubstring.java | 3 +- .../mutation/MutateGASwapBitsSegmentwise.java | 3 +- .../operators/mutation/MutateGAUniform.java | 3 +- .../go/operators/mutation/MutateGIInvert.java | 4 +- .../operators/mutation/MutateGIOrdinal.java | 2 +- .../go/operators/mutation/MutateGISubset.java | 3 +- .../mutation/MutateGITranslocate.java | 4 +- .../operators/mutation/MutateGPAdaptive.java | 2 +- .../mutation/MutateGPSingleNode.java | 1 - .../go/operators/mutation/MutateOBGAFlip.java | 1 - .../mutation/PropertyMutationMixer.java | 22 ++- .../mutation/PropertyMutationMixerEditor.java | 14 +- .../StandardDeactivationStrategy.java | 3 +- .../merging/InterfaceMergingStrategy.java | 3 +- .../merging/ScatterMergingStrategy.java | 3 +- .../merging/StandardMergingStrategy.java | 3 +- .../AbstractLinearParamAdaption.java | 3 +- .../AbstractParameterControl.java | 8 +- .../CbpsoFitnessThresholdBasedAdaption.java | 3 +- .../paramcontrol/ConstantParameters.java | 3 +- .../paramcontrol/ConstraintBasedAdaption.java | 5 +- .../ExponentialDecayAdaption.java | 3 +- .../paramcontrol/LinearParamAdaption.java | 1 - .../paramcontrol/NoParamAdaption.java | 3 +- .../PSOActivityFeedbackControl.java | 3 +- .../paramcontrol/PSOInertnessAdaption.java | 1 - .../paramcontrol/ParameterControlManager.java | 25 ++- .../paramcontrol/SinusoidalParamAdaption.java | 1 - .../paramcontrol/SuccessBasedAdaption.java | 3 +- .../MetricD1ApproxParetoFront.java | 7 +- .../MetricD1TrueParetoFront.java | 7 +- .../paretofrontmetrics/MetricErrorRatio.java | 4 +- .../MetricMaximumParetoFrontError.java | 7 +- .../operators/paretofrontmetrics/MetricS.java | 14 +- .../MetricSWithReference.java | 17 +- .../go/operators/postprocess/PostProcess.java | 8 +- .../postprocess/PostProcessParams.java | 3 +- .../postprocess/SolutionHistogram.java | 11 +- .../selection/SelectBestIndividuals.java | 3 +- .../selection/SelectEPTournaments.java | 3 +- .../SelectMOMAIIDominanceCounter.java | 1 - .../go/operators/selection/SelectMOPESA.java | 1 - .../operators/selection/SelectMOPESAII.java | 7 +- .../operators/selection/SelectMOSPEAII.java | 2 - .../selection/SelectParticleWheel.java | 1 - .../go/operators/selection/SelectRandom.java | 4 +- .../probability/AbstractSelProb.java | 9 +- .../probability/SelProbBoltzman.java | 60 +++++-- .../probability/SelProbFitnessSharing.java | 2 +- .../probability/SelProbInvertByMax.java | 14 +- .../probability/SelProbLinearRanking.java | 12 +- .../probability/SelProbNonLinearRanking.java | 12 +- .../selection/probability/SelProbRanking.java | 16 +- .../probability/SelProbStandard.java | 18 +- .../probability/SelProbStandardScaling.java | 16 +- .../selection/replacement/ReplaceWorst.java | 1 - ...ntNondominatedSortingDistanceCrowding.java | 1 - .../terminators/CombinedTerminator.java | 3 +- .../terminators/EvaluationTerminator.java | 3 +- .../FitnessConvergenceTerminator.java | 3 +- .../terminators/FitnessValueTerminator.java | 3 +- .../HistoryConvergenceTerminator.java | 5 +- .../KnownOptimaFoundTerminator.java | 3 +- .../terminators/ParetoMetricTerminator.java | 3 +- .../PopulationMeasureTerminator.java | 1 - .../server/go/populations/PBILPopulation.java | 8 +- .../server/go/populations/Population.java | 6 +- .../go/problems/AbstractDynTransProblem.java | 13 +- .../AbstractMultiModalProblemKnown.java | 3 +- ...ractMultiObjectiveOptimizationProblem.java | 12 +- .../problems/AbstractOptimizationProblem.java | 22 ++- .../go/problems/AbstractProblemBinary.java | 3 +- .../go/problems/AbstractProblemDouble.java | 9 +- src/eva2/server/go/problems/B1Problem.java | 7 +- .../server/go/problems/BKnapsackProblem.java | 4 +- .../go/problems/ConstrHimmelblauProblem.java | 5 +- .../go/problems/ConstrPressureVessel.java | 1 - .../server/go/problems/DynJumpProblem.java | 12 +- src/eva2/server/go/problems/ERPStarter.java | 4 +- .../go/problems/ExternalRuntimeProblem.java | 23 ++- src/eva2/server/go/problems/F15Problem.java | 3 +- src/eva2/server/go/problems/F19Problem.java | 5 +- src/eva2/server/go/problems/F20Problem.java | 3 +- src/eva2/server/go/problems/F8Problem.java | 3 +- src/eva2/server/go/problems/FLensProblem.java | 20 ++- .../InterfaceMultiObjectiveDeNovoProblem.java | 1 - .../InterfaceOptimizationProblem.java | 3 +- .../go/problems/MatlabEvalMediator.java | 3 +- .../server/go/problems/MatlabProblem.java | 8 +- .../go/problems/PSymbolicRegression.java | 25 ++- .../go/problems/SimpleProblemWrapper.java | 11 +- src/eva2/server/go/problems/TF1Problem.java | 8 +- .../go/problems/WaitForEvARunnable.java | 5 +- .../inference/metabolic/TimeSeries.java | 24 +-- .../problems/regression/RFKoza_GPI_10_1.java | 4 +- .../problems/regression/RFKoza_GPI_10_2.java | 4 +- .../regression/RFKoza_GPI_7_3_extended.java | 4 +- .../go/problems/regression/RFRaidl_F1.java | 4 +- .../go/problems/regression/RFRaidl_F2.java | 4 +- .../go/problems/regression/RFRaidl_F3.java | 4 +- src/eva2/server/go/strategies/ANPSO.java | 8 +- src/eva2/server/go/strategies/BOA.java | 11 +- .../go/strategies/BinaryScatterSearch.java | 9 +- src/eva2/server/go/strategies/CBNPSO.java | 3 +- .../CHCAdaptiveSearchAlgorithm.java | 3 +- .../go/strategies/ClusterBasedNichingEA.java | 17 +- .../go/strategies/ClusteringHillClimbing.java | 3 +- .../go/strategies/DifferentialEvolution.java | 3 +- .../DynamicParticleSwarmOptimization.java | 1 - .../server/go/strategies/EsDpiNiching.java | 7 +- .../go/strategies/EvolutionStrategyIPOP.java | 5 +- .../server/go/strategies/FloodAlgorithm.java | 6 +- .../strategies/GradientDescentAlgorithm.java | 18 +- .../server/go/strategies/HillClimbing.java | 1 - src/eva2/server/go/strategies/LTGA.java | 2 - src/eva2/server/go/strategies/MLTGA.java | 2 - .../go/strategies/MemeticAlgorithm.java | 3 +- .../go/strategies/MonteCarloSearch.java | 4 +- .../go/strategies/MultiObjectiveCMAES.java | 5 +- .../go/strategies/MultiObjectiveEA.java | 4 +- .../go/strategies/NelderMeadSimplex.java | 26 ++- src/eva2/server/go/strategies/NichePSO.java | 31 ++-- .../ParticleSubSwarmOptimization.java | 5 +- .../ParticleSwarmOptimizationGCPSO.java | 1 - .../server/go/strategies/ScatterSearch.java | 39 +++-- .../go/strategies/SimulatedAnnealing.java | 4 +- .../server/go/strategies/SteadyStateGA.java | 4 +- .../go/strategies/ThresholdAlgorithm.java | 5 +- src/eva2/server/go/strategies/Tribes.java | 5 +- .../go/strategies/WingedMultiObjectiveEA.java | 8 +- .../go/strategies/tribes/TribesExplorer.java | 17 +- .../go/strategies/tribes/TribesPosition.java | 7 +- .../go/strategies/tribes/TribesSwarm.java | 29 ++-- .../server/go/tools/AbstractObjectEditor.java | 8 +- src/eva2/server/go/tools/DeNovofilter.java | 7 +- .../go/tools/DoubleArrayComparator.java | 3 +- src/eva2/server/go/tools/FileTools.java | 1 - src/eva2/server/go/tools/GeneralGEOFaker.java | 4 +- .../server/go/tools/GeneralGOEProperty.java | 4 +- .../GeneralGenericObjectEditorPanel.java | 2 - .../go/tools/ImpactOfDimensionOnMOEAs.java | 5 +- .../go/tools/ParetoFrontLocalTester.java | 5 +- .../server/go/tools/PortfolioFrontTester.java | 3 +- src/eva2/server/go/tools/TestingDArea.java | 4 +- .../server/modules/AbstractGOParameters.java | 1 - .../server/modules/AbstractModuleAdapter.java | 1 - src/eva2/server/modules/DEParameters.java | 2 - src/eva2/server/modules/GOParameters.java | 3 +- .../server/modules/GenericModuleAdapter.java | 5 +- src/eva2/server/modules/HCParameters.java | 1 - src/eva2/server/modules/PSOParameters.java | 3 +- src/eva2/server/modules/Processor.java | 1 - src/eva2/server/stat/AbstractStatistics.java | 33 +++- src/eva2/server/stat/EvAJob.java | 9 +- src/eva2/server/stat/EvAJobList.java | 3 - .../server/stat/EvAStatisticalEvaluation.java | 13 +- .../stat/EvAStatisticalEvaluationParams.java | 4 +- src/eva2/server/stat/InterfaceStatistics.java | 3 +- src/eva2/server/stat/MovingAverage.java | 4 +- src/eva2/server/stat/StatisticsDummy.java | 3 +- .../server/stat/StatisticsStandalone.java | 14 +- src/eva2/server/stat/StatisticsWithGUI.java | 3 +- src/eva2/tools/BasicResourceLoader.java | 4 +- src/eva2/tools/CubicSpline.java | 2 +- src/eva2/tools/EVAHELP.java | 2 +- src/eva2/tools/KMEANSJAVA.java | 20 ++- src/eva2/tools/MultirunRefiner.java | 12 +- src/eva2/tools/PairComparator.java | 3 +- src/eva2/tools/ReflectPackage.java | 12 +- src/eva2/tools/ServerPingThread.java | 5 +- src/eva2/tools/StringSelection.java | 3 +- src/eva2/tools/StringTools.java | 4 +- src/eva2/tools/ToolBoxGui.java | 1 - src/eva2/tools/URLGetter.java | 2 +- .../Chart2DDPointContentSelectable.java | 4 +- .../chart2d/Chart2DDPointIconContent.java | 11 +- src/eva2/tools/chart2d/DArea.java | 4 +- src/eva2/tools/chart2d/DArray.java | 9 +- src/eva2/tools/chart2d/DContainer.java | 15 +- src/eva2/tools/chart2d/DGrid.java | 5 +- src/eva2/tools/chart2d/DMeasures.java | 11 +- src/eva2/tools/chart2d/DPointSet.java | 3 +- src/eva2/tools/chart2d/DRectangle.java | 3 +- src/eva2/tools/chart2d/ScaledBorder.java | 4 +- .../tools/diagram/ColorBarCalculator.java | 5 - src/eva2/tools/jproxy/ComAdapter.java | 5 +- .../jproxy/RMIInvocationHandlerImpl.java | 11 +- src/eva2/tools/jproxy/RMIServer.java | 1 - .../RMIThreadInvocationHandlerImpl.java | 3 +- src/eva2/tools/math/BayNet.java | 158 +++++++++--------- .../math/Jama/CholeskyDecomposition.java | 16 +- .../math/Jama/EigenvalueDecomposition.java | 92 +++++----- src/eva2/tools/math/Jama/Matrix.java | 45 +++-- .../math/Jama/SingularValueDecomposition.java | 2 +- src/eva2/tools/math/Mathematics.java | 53 +++--- .../math/interpolation/PolyInterpolation.java | 15 +- src/eva2/tools/matlab/JMatLink.java | 5 +- src/eva2/tools/print/PagePrinter.java | 6 +- src/simpleprobs/SimpleB1.java | 4 +- test/eva2/tools/SerializerTest.java | 2 - 378 files changed, 1837 insertions(+), 1452 deletions(-) diff --git a/src/eva2/client/EvAClient.java b/src/eva2/client/EvAClient.java index ce865248..f70a3c69 100644 --- a/src/eva2/client/EvAClient.java +++ b/src/eva2/client/EvAClient.java @@ -12,6 +12,7 @@ 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/client/RMIConnectionEvA.java b/src/eva2/client/RMIConnectionEvA.java index 88dde381..d7b53e66 100644 --- a/src/eva2/client/RMIConnectionEvA.java +++ b/src/eva2/client/RMIConnectionEvA.java @@ -1,13 +1,12 @@ package eva2.client; -import java.net.InetAddress; -import java.net.UnknownHostException; - import eva2.server.EvAMainAdapter; import eva2.server.modules.ModuleAdapter; import eva2.tools.jproxy.MainAdapter; import eva2.tools.jproxy.MainAdapterClient; import eva2.tools.jproxy.RMIConnection; +import java.net.InetAddress; +import java.net.UnknownHostException; /** diff --git a/src/eva2/examples/TerminatorExample.java b/src/eva2/examples/TerminatorExample.java index 4e5e14d9..14e3f828 100644 --- a/src/eva2/examples/TerminatorExample.java +++ b/src/eva2/examples/TerminatorExample.java @@ -31,7 +31,9 @@ public class TerminatorExample { + " evals performed. " + OptimizerFactory.terminatedBecause() + " Found solution: "); - for (int i=0; i0)) { - for (int i=0; i= getNumRows()) k=getNumRows()-1; double[][] newDD = new double[getNumRows()+1][getNumCols()]; - for (int i = 0; i < getNumRows(); i++) - for (int j=0; j=0) for (int j=0; j=0) for (int j=0; j this.m_Weights.length) { double[] newWeights = new double[d.length]; - for (int i = 0; i < this.m_Weights.length; i++) newWeights[i] = this.m_Weights[i]; + for (int i = 0; i < this.m_Weights.length; i++) { + newWeights[i] = this.m_Weights[i]; + } this.m_Weights = newWeights; } else { double[] newWeights = new double[d.length]; - for (int i = 0; i < d.length; i++) newWeights[i] = this.m_Weights[i]; + for (int i = 0; i < d.length; i++) { + newWeights[i] = this.m_Weights[i]; + } this.m_Weights = newWeights; } } diff --git a/src/eva2/gui/PropertyPanel.java b/src/eva2/gui/PropertyPanel.java index c6a3964e..bb22f940 100644 --- a/src/eva2/gui/PropertyPanel.java +++ b/src/eva2/gui/PropertyPanel.java @@ -13,8 +13,6 @@ import eva2.tools.EVAHELP; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; import java.beans.PropertyEditor; import javax.swing.BorderFactory; import javax.swing.JButton; diff --git a/src/eva2/gui/PropertyRemoteServers.java b/src/eva2/gui/PropertyRemoteServers.java index d0c82d54..cd5a22fc 100644 --- a/src/eva2/gui/PropertyRemoteServers.java +++ b/src/eva2/gui/PropertyRemoteServers.java @@ -1,10 +1,9 @@ package eva2.gui; +import eva2.tools.jproxy.RMIInvocationHandler; import java.rmi.Naming; import java.util.ArrayList; -import eva2.tools.jproxy.RMIInvocationHandler; - /** * Created by IntelliJ IDEA. diff --git a/src/eva2/gui/PropertySheetPanelStat.java b/src/eva2/gui/PropertySheetPanelStat.java index c2661a24..c0539ddc 100644 --- a/src/eva2/gui/PropertySheetPanelStat.java +++ b/src/eva2/gui/PropertySheetPanelStat.java @@ -24,8 +24,6 @@ import javax.swing.BorderFactory; import javax.swing.JCheckBox; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; import javax.swing.SwingConstants; /** * diff --git a/src/eva2/gui/StatisticsEditor.java b/src/eva2/gui/StatisticsEditor.java index 5b771512..2ca5673e 100644 --- a/src/eva2/gui/StatisticsEditor.java +++ b/src/eva2/gui/StatisticsEditor.java @@ -9,11 +9,10 @@ package eva2.gui; * $Date: 2007-10-23 13:43:24 +0200 (Tue, 23 Oct 2007) $ * $Author: mkron $ */ -import java.beans.*; -import java.awt.*; -import javax.swing.*; - import eva2.server.stat.GenericStatistics; +import java.awt.*; +import java.beans.*; +import javax.swing.*; public class StatisticsEditor implements PropertyEditor { diff --git a/src/eva2/gui/TagEditor.java b/src/eva2/gui/TagEditor.java index 79d1dfca..48f459b5 100644 --- a/src/eva2/gui/TagEditor.java +++ b/src/eva2/gui/TagEditor.java @@ -10,19 +10,17 @@ package eva2.gui; * $Author: marcekro $ */ +import eva2.EvAInfo; +import eva2.tools.BasicResourceLoader; +import eva2.tools.SelectedTag; +import eva2.tools.Tag; import java.awt.BorderLayout; import java.awt.Toolkit; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.beans.PropertyEditorManager; import java.beans.PropertyEditorSupport; - import javax.swing.JFrame; - -import eva2.EvAInfo; -import eva2.tools.BasicResourceLoader; -import eva2.tools.SelectedTag; -import eva2.tools.Tag; /** * */ diff --git a/src/eva2/gui/TopoPlot.java b/src/eva2/gui/TopoPlot.java index d060abaa..98f12fad 100644 --- a/src/eva2/gui/TopoPlot.java +++ b/src/eva2/gui/TopoPlot.java @@ -12,15 +12,13 @@ package eva2.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ -import java.awt.Color; - -import javax.swing.JPanel; - import eva2.server.go.problems.Interface2DBorderProblem; import eva2.server.go.problems.InterfaceFirstOrderDerivableProblem; import eva2.tools.chart2d.DRectangle; import eva2.tools.diagram.ColorBarCalculator; import eva2.tools.math.Mathematics; +import java.awt.Color; +import javax.swing.JPanel; /*==========================================================================* @@ -121,7 +119,9 @@ public class TopoPlot extends Plot { if (tmp > max) max = tmp; if (withGradientsIfAvailable && (problem instanceof InterfaceFirstOrderDerivableProblem)) { double[] deriv = ((InterfaceFirstOrderDerivableProblem)problem).getFirstOrderGradients(problem.project2DPoint(pos)); - for (int i=0; i<2;i++) maxDeriv=Math.max(maxDeriv, Math.abs(deriv[i])); // maximum deriv of first 2 dims + for (int i=0; i<2;i++) { + maxDeriv=Math.max(maxDeriv, Math.abs(deriv[i])); + } // maximum deriv of first 2 dims } } // for y diff --git a/src/eva2/gui/utils/CustomTabbedPaneUI.java b/src/eva2/gui/utils/CustomTabbedPaneUI.java index a5d7e68a..0342170a 100644 --- a/src/eva2/gui/utils/CustomTabbedPaneUI.java +++ b/src/eva2/gui/utils/CustomTabbedPaneUI.java @@ -4,13 +4,13 @@ */ package eva2.gui.utils; -import javax.swing.*; -import javax.swing.plaf.ComponentUI; -import javax.swing.plaf.basic.BasicTabbedPaneUI; import java.awt.*; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; +import javax.swing.*; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.basic.BasicTabbedPaneUI; public class CustomTabbedPaneUI extends BasicTabbedPaneUI { diff --git a/src/eva2/server/ModuleServer.java b/src/eva2/server/ModuleServer.java index b6352027..209387ef 100644 --- a/src/eva2/server/ModuleServer.java +++ b/src/eva2/server/ModuleServer.java @@ -19,8 +19,8 @@ import eva2.tools.jproxy.MainAdapterClient; import eva2.tools.jproxy.RMIProxyLocal; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import java.util.List; import java.util.ArrayList; +import java.util.List; import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/eva2/server/go/GOStandaloneVersion.java b/src/eva2/server/go/GOStandaloneVersion.java index f686fe2c..db6c0ac6 100644 --- a/src/eva2/server/go/GOStandaloneVersion.java +++ b/src/eva2/server/go/GOStandaloneVersion.java @@ -2,6 +2,7 @@ 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; @@ -231,7 +232,9 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu m_Continue.setEnabled(true); m_StopButton.setEnabled(false); worker.interrupt(); - for (int i = 0; i < m_MultiRuns; i++) m_Plot.clearGraph(1000 +i); + for (int i = 0; i < m_MultiRuns; i++) { + m_Plot.clearGraph(1000 +i); + } } }; @@ -448,7 +451,9 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu System.out.println("Failed to close output file!"); } } - if (this.show) for (int i = 0; i < this.m_MultiRuns; i++) this.m_Plot.clearGraph(1000 +i); + if (this.show) for (int i = 0; i < this.m_MultiRuns; i++) { + this.m_Plot.clearGraph(1000 +i); + } updateStatus(0); if (this.show) this.m_StatusField.setText("Finished..."); return "All Done"; @@ -573,7 +578,9 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu tmpLine.append("\t"); tmpLine.append(population.getBestEAIndividual().getFitness(0)); tmpLine.append("\t"); - for (int i = 0; i < population.size(); i++) tmpd += ((AbstractEAIndividual)population.get(i)).getFitness(0)/(double)population.size(); + for (int i = 0; i < population.size(); i++) { + tmpd += ((AbstractEAIndividual)population.get(i)).getFitness(0)/(double)population.size(); + } tmpLine.append("\t"); tmpLine.append(tmpd); tmpLine.append("\t"); diff --git a/src/eva2/server/go/InterfaceNotifyOnInformers.java b/src/eva2/server/go/InterfaceNotifyOnInformers.java index b39b27a1..efa1d15d 100644 --- a/src/eva2/server/go/InterfaceNotifyOnInformers.java +++ b/src/eva2/server/go/InterfaceNotifyOnInformers.java @@ -1,8 +1,7 @@ package eva2.server.go; -import java.util.List; - import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; +import java.util.List; public interface InterfaceNotifyOnInformers { /** diff --git a/src/eva2/server/go/MOCCOStandalone.java b/src/eva2/server/go/MOCCOStandalone.java index 0eca9906..f1538252 100644 --- a/src/eva2/server/go/MOCCOStandalone.java +++ b/src/eva2/server/go/MOCCOStandalone.java @@ -2,6 +2,7 @@ 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; @@ -17,7 +18,6 @@ import java.awt.Dimension; import java.awt.GridLayout; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.Serializable; import java.io.*; import javax.swing.*; diff --git a/src/eva2/server/go/individuals/ESIndividualBinaryData.java b/src/eva2/server/go/individuals/ESIndividualBinaryData.java index 6ff16595..abdc5733 100644 --- a/src/eva2/server/go/individuals/ESIndividualBinaryData.java +++ b/src/eva2/server/go/individuals/ESIndividualBinaryData.java @@ -1,13 +1,12 @@ package eva2.server.go.individuals; -import java.util.BitSet; - import eva2.server.go.operators.crossover.CrossoverESDefault; import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.server.go.operators.mutation.MutateESGlobal; import eva2.server.go.problems.InterfaceHasInitRange; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; +import java.util.BitSet; /** This individual uses a real-valued genotype to code for binary values, either @@ -206,9 +205,13 @@ public class ESIndividualBinaryData extends AbstractEAIndividual implements Inte String result = ""; result += "ESIndividual coding double: ("; result += "Fitness {"; - for (int i = 0; i < this.m_Fitness.length; i++) result += this.m_Fitness[i] + ";"; + for (int i = 0; i < this.m_Fitness.length; i++) { + result += this.m_Fitness[i] + ";"; + } result += "}/SelProb{"; - for (int i = 0; i < this.m_SelectionProbability.length; i++) result += this.m_SelectionProbability[i] + ";"; + for (int i = 0; i < this.m_SelectionProbability.length; i++) { + result += this.m_SelectionProbability[i] + ";"; + } result += "})\n Value: "; result += "["; for (int i = 0; i < this.m_Genotype.length; i++) { diff --git a/src/eva2/server/go/individuals/ESIndividualIntegerData.java b/src/eva2/server/go/individuals/ESIndividualIntegerData.java index 4897adda..ca5ad9cc 100644 --- a/src/eva2/server/go/individuals/ESIndividualIntegerData.java +++ b/src/eva2/server/go/individuals/ESIndividualIntegerData.java @@ -223,9 +223,13 @@ public class ESIndividualIntegerData extends AbstractEAIndividual implements Int String result = ""; result += "ESIndividual coding int: ("; result += "Fitness {"; - for (int i = 0; i < this.m_Fitness.length; i++) result += this.m_Fitness[i] + ";"; + for (int i = 0; i < this.m_Fitness.length; i++) { + result += this.m_Fitness[i] + ";"; + } result += "}/SelProb{"; - for (int i = 0; i < this.m_SelectionProbability.length; i++) result += this.m_SelectionProbability[i] + ";"; + for (int i = 0; i < this.m_SelectionProbability.length; i++) { + result += this.m_SelectionProbability[i] + ";"; + } result += "})\n Value: "; result += "["; for (int i = 0; i < this.m_Genotype.length; i++) { diff --git a/src/eva2/server/go/individuals/ESIndividualPermutationData.java b/src/eva2/server/go/individuals/ESIndividualPermutationData.java index 50501474..b45909a8 100644 --- a/src/eva2/server/go/individuals/ESIndividualPermutationData.java +++ b/src/eva2/server/go/individuals/ESIndividualPermutationData.java @@ -252,9 +252,13 @@ public class ESIndividualPermutationData extends AbstractEAIndividual implements String result = ""; result += "ESIndividual coding permutation: ("; result += "Fitness {"; - for (int i = 0; i < this.m_Fitness.length; i++) result += this.m_Fitness[i] + ";"; + for (int i = 0; i < this.m_Fitness.length; i++) { + result += this.m_Fitness[i] + ";"; + } result += "}/SelProb{"; - for (int i = 0; i < this.m_SelectionProbability.length; i++) result += this.m_SelectionProbability[i] + ";"; + for (int i = 0; i < this.m_SelectionProbability.length; i++) { + result += this.m_SelectionProbability[i] + ";"; + } result += "})\n Value: "; result += "["; for (int i = 0; i < this.m_Genotype.length; i++) { diff --git a/src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java b/src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java index e4c49a7d..c1d2aa4a 100644 --- a/src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java +++ b/src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java @@ -1,12 +1,11 @@ package eva2.server.go.individuals; -import java.util.BitSet; - import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; +import java.util.BitSet; /** This individual combines a binary and a real-valued phenotype. * Created by IntelliJ IDEA. @@ -139,12 +138,16 @@ public class GAESIndividualBinaryDoubleData extends AbstractEAIndividual impleme numTmp = (AbstractEAIndividual)this.getNumbers(); numPop = new Population(); - for (int i = 0; i < partners.size(); i++) numPop.add(((GAESIndividualBinaryDoubleData)partners.get(i)).getNumbers()); + for (int i = 0; i < partners.size(); i++) { + numPop.add(((GAESIndividualBinaryDoubleData)partners.get(i)).getNumbers()); + } resNum = numTmp.mateWith(numPop); binTmp = (AbstractEAIndividual)this.getBitSet(); binPop = new Population(); - for (int i = 0; i < partners.size(); i++) binPop.add(((GAESIndividualBinaryDoubleData)partners.get(i)).getBitSet()); + for (int i = 0; i < partners.size(); i++) { + binPop.add(((GAESIndividualBinaryDoubleData)partners.get(i)).getBitSet()); + } resBin = binTmp.mateWith(binPop); result = new GAESIndividualBinaryDoubleData[resNum.length]; @@ -172,7 +175,9 @@ public class GAESIndividualBinaryDoubleData extends AbstractEAIndividual impleme result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); } } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); + for (int i = 0; i < result.length; i++) { + result[i].giveNewName(); + } return result; } diff --git a/src/eva2/server/go/individuals/GAIndividualBinaryData.java b/src/eva2/server/go/individuals/GAIndividualBinaryData.java index cadf8694..4120d857 100644 --- a/src/eva2/server/go/individuals/GAIndividualBinaryData.java +++ b/src/eva2/server/go/individuals/GAIndividualBinaryData.java @@ -1,14 +1,13 @@ package eva2.server.go.individuals; -import java.util.BitSet; - import eva2.server.go.operators.crossover.CrossoverGAGINPoint; import eva2.server.go.operators.crossover.InterfaceCrossover; import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.server.go.operators.mutation.MutateGANBit; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; +import java.util.BitSet; /** This individual uses a binary genotype to code for binary values. * Created by IntelliJ IDEA. @@ -126,8 +125,10 @@ public class GAIndividualBinaryData extends AbstractEAIndividual implements Inte return this.m_Fitness; } - /** This method will return a string description of the GAIndividal - * noteably the Genotype. + /** + * This method will return a string description of the GAIndividal + * notably the Genotype. + * * @return A descriptive string */ @Override @@ -135,9 +136,13 @@ public class GAIndividualBinaryData extends AbstractEAIndividual implements Inte String result = ""; result += "GAIndividual: ("; result += "Fitness {"; - for (int i = 0; i < this.m_Fitness.length; i++) result += this.m_Fitness[i] + ";"; + for (int i = 0; i < this.m_Fitness.length; i++) { + result += this.m_Fitness[i] + ";"; + } result += "}/SelProb{"; - for (int i = 0; i < this.m_SelectionProbability.length; i++) result += this.m_SelectionProbability[i] + ";"; + for (int i = 0; i < this.m_SelectionProbability.length; i++) { + result += this.m_SelectionProbability[i] + ";"; + } result += "})\n Value: "; result += "{"; for (int i = 0; i < this.m_GenotypeLength; i++) { @@ -149,9 +154,6 @@ public class GAIndividualBinaryData extends AbstractEAIndividual implements Inte result += "\n Mutation ("+this.m_MutationProbability+"):" + this.m_MutationOperator.getStringRepresentation(); return result; } -/************************************************************************************ - * InterfaceGAIndividual methods - */ /** This method allows you to read the binary data * @return BitSet representing the binary data. @@ -161,8 +163,10 @@ public class GAIndividualBinaryData extends AbstractEAIndividual implements Inte return this.m_Genotype; } - /** This method allows you to set the binary data, this can be used for + /** + * This method allows you to set the binary data, this can be used for * memetic algorithms. + * * @param binaryData The new binary data. */ @Override diff --git a/src/eva2/server/go/individuals/GAIndividualDoubleData.java b/src/eva2/server/go/individuals/GAIndividualDoubleData.java index c727f433..b6abf815 100644 --- a/src/eva2/server/go/individuals/GAIndividualDoubleData.java +++ b/src/eva2/server/go/individuals/GAIndividualDoubleData.java @@ -1,8 +1,6 @@ package eva2.server.go.individuals; -import java.util.BitSet; - import eva2.server.go.individuals.codings.ga.GAStandardCodingDouble; import eva2.server.go.individuals.codings.ga.InterfaceGADoubleCoding; import eva2.server.go.operators.crossover.CrossoverGAGINPoint; @@ -11,6 +9,7 @@ import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.server.go.operators.mutation.MutateGAUniform; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; +import java.util.BitSet; /** This individual uses a binary genotype to code for double values * using two alternative encodings. @@ -247,9 +246,13 @@ public class GAIndividualDoubleData extends AbstractEAIndividual implements Inte String result = ""; result += "GAIndividual coding double: ("; result += "Fitness {"; - for (int i = 0; i < this.m_Fitness.length; i++) result += this.m_Fitness[i] + ";"; + for (int i = 0; i < this.m_Fitness.length; i++) { + result += this.m_Fitness[i] + ";"; + } result += "}/SelProb{"; - for (int i = 0; i < this.m_SelectionProbability.length; i++) result += this.m_SelectionProbability[i] + ";"; + for (int i = 0; i < this.m_SelectionProbability.length; i++) { + result += this.m_SelectionProbability[i] + ";"; + } result += "})\n Value: "; result += "["; double[] d = this.getDoubleData(); diff --git a/src/eva2/server/go/individuals/GAIndividualIntegerData.java b/src/eva2/server/go/individuals/GAIndividualIntegerData.java index 60c56aef..39e7eb57 100644 --- a/src/eva2/server/go/individuals/GAIndividualIntegerData.java +++ b/src/eva2/server/go/individuals/GAIndividualIntegerData.java @@ -1,8 +1,6 @@ package eva2.server.go.individuals; -import java.util.BitSet; - import eva2.server.go.individuals.codings.ga.GAStandardCodingInteger; import eva2.server.go.individuals.codings.ga.InterfaceGAIntegerCoding; import eva2.server.go.operators.crossover.CrossoverGAGINPoint; @@ -10,6 +8,7 @@ import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.server.go.operators.mutation.MutateGANBit; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; +import java.util.BitSet; /** This individual uses a binary genotype to code for binary values using * two alternative encodings. @@ -273,9 +272,13 @@ public class GAIndividualIntegerData extends AbstractEAIndividual implements Int String result = ""; result += "GAIndividual coding int: ("; result += "Fitness {"; - for (int i = 0; i < this.m_Fitness.length; i++) result += this.m_Fitness[i] + ";"; + for (int i = 0; i < this.m_Fitness.length; i++) { + result += this.m_Fitness[i] + ";"; + } result += "}/SelProb{"; - for (int i = 0; i < this.m_SelectionProbability.length; i++) result += this.m_SelectionProbability[i] + ";"; + for (int i = 0; i < this.m_SelectionProbability.length; i++) { + result += this.m_SelectionProbability[i] + ";"; + } result += "})\n Value: "; result += "["; int[] d = this.getIntegerData(); @@ -295,7 +298,9 @@ public class GAIndividualIntegerData extends AbstractEAIndividual implements Int result += "]\n"; result += "{"; int overallLength = 0; - for (int i = 0; i < this.m_CodingLenghts.length; i++) overallLength += this.m_CodingLenghts[i]; + for (int i = 0; i < this.m_CodingLenghts.length; i++) { + overallLength += this.m_CodingLenghts[i]; + } for (int i = 0; i < overallLength; i++) { if (this.m_Genotype.get(i)) result += "1"; else result += "0"; @@ -333,14 +338,18 @@ public class GAIndividualIntegerData extends AbstractEAIndividual implements Int @Override public int getGenotypeLength() { int overallLength = 0; - for (int i = 0; i < this.m_CodingLenghts.length; i++) overallLength += this.m_CodingLenghts[i]; + for (int i = 0; i < this.m_CodingLenghts.length; i++) { + overallLength += this.m_CodingLenghts[i]; + } return overallLength; } @Override public void defaultInit(InterfaceOptimizationProblem prob) { int overallLength = 0; - for (int i = 0; i < this.m_CodingLenghts.length; i++) overallLength += this.m_CodingLenghts[i]; + for (int i = 0; i < this.m_CodingLenghts.length; i++) { + overallLength += this.m_CodingLenghts[i]; + } for (int i = 0; i < overallLength; i++) { if (RNG.flipCoin(0.5)) this.m_Genotype.set(i); else this.m_Genotype.clear(i); @@ -352,7 +361,9 @@ public class GAIndividualIntegerData extends AbstractEAIndividual implements Int @Override public void defaultMutate() { int overallLength = 0; - for (int i = 0; i < this.m_CodingLenghts.length; i++) overallLength += this.m_CodingLenghts[i]; + for (int i = 0; i < this.m_CodingLenghts.length; i++) { + overallLength += this.m_CodingLenghts[i]; + } int mutationIndex = RNG.randomInt(0, overallLength); if (this.m_Genotype.get(mutationIndex)) this.m_Genotype.clear(mutationIndex); else this.m_Genotype.set(mutationIndex); diff --git a/src/eva2/server/go/individuals/GAPIndividualProgramData.java b/src/eva2/server/go/individuals/GAPIndividualProgramData.java index 7a9e938b..97c9a983 100644 --- a/src/eva2/server/go/individuals/GAPIndividualProgramData.java +++ b/src/eva2/server/go/individuals/GAPIndividualProgramData.java @@ -134,12 +134,16 @@ public class GAPIndividualProgramData extends AbstractEAIndividual implements In numTmp = (AbstractEAIndividual)this.getNumbers(); numPop = new Population(); - for (int i = 0; i < partners.size(); i++) numPop.add(((GAPIndividualProgramData)partners.get(i)).getNumbers()); + for (int i = 0; i < partners.size(); i++) { + numPop.add(((GAPIndividualProgramData)partners.get(i)).getNumbers()); + } resNum = numTmp.mateWith(numPop); binTmp = (AbstractEAIndividual)this.getProgramRepresentation(); binPop = new Population(); - for (int i = 0; i < partners.size(); i++) binPop.add(((GAPIndividualProgramData)partners.get(i)).getProgramRepresentation()); + for (int i = 0; i < partners.size(); i++) { + binPop.add(((GAPIndividualProgramData)partners.get(i)).getProgramRepresentation()); + } resBin = binTmp.mateWith(binPop); result = new GAPIndividualProgramData[resNum.length]; @@ -156,7 +160,9 @@ public class GAPIndividualProgramData extends AbstractEAIndividual implements In result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); } } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); + for (int i = 0; i < result.length; i++) { + result[i].giveNewName(); + } return result; } diff --git a/src/eva2/server/go/individuals/GEIndividualProgramData.java b/src/eva2/server/go/individuals/GEIndividualProgramData.java index e00c7ea0..b051c11d 100644 --- a/src/eva2/server/go/individuals/GEIndividualProgramData.java +++ b/src/eva2/server/go/individuals/GEIndividualProgramData.java @@ -1,9 +1,6 @@ package eva2.server.go.individuals; -import java.util.ArrayList; -import java.util.BitSet; - import eva2.server.go.individuals.codings.gp.AbstractGPNode; import eva2.server.go.individuals.codings.gp.GPArea; import eva2.server.go.individuals.codings.gp.InterfaceProgram; @@ -12,6 +9,8 @@ import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.server.go.operators.mutation.MutateDefault; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; +import java.util.ArrayList; +import java.util.BitSet; /** This individual uses a binary genotype to code for a tree-based representation * using a BNF grammar, see also Grammatical Evolution. @@ -154,7 +153,9 @@ public class GEIndividualProgramData extends AbstractEAIndividual implements Int // Now i get a sorted list ArrayList[] directList = new ArrayList[maxArity + 1]; - for (int i = 0; i < directList.length; i++) directList[i] = new ArrayList(); + for (int i = 0; i < directList.length; i++) { + directList[i] = new ArrayList(); + } for (int i = 0; i < area.size(); i++) { directList[((AbstractGPNode) area.get(i)).getArity()].add(area.get(i)); } @@ -173,7 +174,9 @@ public class GEIndividualProgramData extends AbstractEAIndividual implements Int // this is a .... if (directList[i].size() > 0) { tmpRule[0] = i+1; - for (int j = 1; j < i+1; j++) tmpRule[j] = 0; + for (int j = 1; j < i+1; j++) { + tmpRule[j] = 0; + } } else { tmpRule = null; } @@ -228,7 +231,9 @@ public class GEIndividualProgramData extends AbstractEAIndividual implements Int result += "T \t := \t{"; this.m_Area[t].compileReducedList(); ArrayList area = this.m_Area[t].getReducedList(); - for (int i = 0; i < area.size(); i++) result += ((AbstractGPNode)area.get(i)).getStringRepresentation()+", "; + for (int i = 0; i < area.size(); i++) { + result += ((AbstractGPNode)area.get(i)).getStringRepresentation()+", "; + } result += "}\n"; // now the S result += "S \t := \t\n\n"; @@ -250,13 +255,17 @@ public class GEIndividualProgramData extends AbstractEAIndividual implements Int // These are the GP-Terminals tmpNodes = (AbstractGPNode[])this.m_Rules[t][i]; result += "1. \t := \t \t::\t"+ tmpNodes[0].getStringRepresentation()+"\n"; - for (int j = 1; j < tmpNodes.length; j++) result += "\t \t \t \t \t \t"+ tmpNodes[j].getStringRepresentation()+"\n"; + for (int j = 1; j < tmpNodes.length; j++) { + result += "\t \t \t \t \t \t"+ tmpNodes[j].getStringRepresentation()+"\n"; + } } else { // These are the GP-Functions tmpNodes = (AbstractGPNode[])this.m_Rules[t][i]; if (tmpNodes.length > 0) { result += i+". \t := \t \t::\t"+ tmpNodes[0].getStringRepresentation()+"\n"; - for (int j = 1; j < tmpNodes.length; j++) result += "\t \t \t \t \t \t"+ tmpNodes[j].getStringRepresentation()+"\n"; + for (int j = 1; j < tmpNodes.length; j++) { + result += "\t \t \t \t \t \t"+ tmpNodes[j].getStringRepresentation()+"\n"; + } } } } diff --git a/src/eva2/server/go/individuals/GIIndividualIntegerData.java b/src/eva2/server/go/individuals/GIIndividualIntegerData.java index 3a19a4e3..492413be 100644 --- a/src/eva2/server/go/individuals/GIIndividualIntegerData.java +++ b/src/eva2/server/go/individuals/GIIndividualIntegerData.java @@ -231,9 +231,13 @@ public class GIIndividualIntegerData extends AbstractEAIndividual implements Int String result = ""; result += "GIIndividual coding int: ("; result += "Fitness {"; - for (int i = 0; i < this.m_Fitness.length; i++) result += this.m_Fitness[i] + ";"; + for (int i = 0; i < this.m_Fitness.length; i++) { + result += this.m_Fitness[i] + ";"; + } result += "}/SelProb{"; - for (int i = 0; i < this.m_SelectionProbability.length; i++) result += this.m_SelectionProbability[i] + ";"; + for (int i = 0; i < this.m_SelectionProbability.length; i++) { + result += this.m_SelectionProbability[i] + ";"; + } result += "})\n Value: "; result += "["; int[] d = this.getIntegerData(); diff --git a/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java b/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java index df5c2cd5..cbdd4453 100644 --- a/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java +++ b/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java @@ -136,12 +136,16 @@ public class GIOBGAIndividualIntegerPermutationData extends AbstractEAIndividual numTmp = (AbstractEAIndividual)this.getIntegers(); numPop = new Population(); - for (int i = 0; i < partners.size(); i++) numPop.add(((GIOBGAIndividualIntegerPermutationData)partners.get(i)).getIntegers()); + for (int i = 0; i < partners.size(); i++) { + numPop.add(((GIOBGAIndividualIntegerPermutationData)partners.get(i)).getIntegers()); + } resNum = numTmp.mateWith(numPop); binTmp = (AbstractEAIndividual)this.getPermutations(); binPop = new Population(); - for (int i = 0; i < partners.size(); i++) binPop.add(((GIOBGAIndividualIntegerPermutationData)partners.get(i)).getPermutations()); + for (int i = 0; i < partners.size(); i++) { + binPop.add(((GIOBGAIndividualIntegerPermutationData)partners.get(i)).getPermutations()); + } resBin = binTmp.mateWith(binPop); result = new GIOBGAIndividualIntegerPermutationData[resNum.length]; @@ -169,7 +173,9 @@ public class GIOBGAIndividualIntegerPermutationData extends AbstractEAIndividual result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); } } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); + for (int i = 0; i < result.length; i++) { + result[i].giveNewName(); + } return result; } diff --git a/src/eva2/server/go/individuals/GPIndividualProgramData.java b/src/eva2/server/go/individuals/GPIndividualProgramData.java index 148d3f90..a421ad97 100644 --- a/src/eva2/server/go/individuals/GPIndividualProgramData.java +++ b/src/eva2/server/go/individuals/GPIndividualProgramData.java @@ -1,7 +1,6 @@ package eva2.server.go.individuals; -import java.util.ArrayList; import eva2.server.go.individuals.codings.gp.AbstractGPNode; import eva2.server.go.individuals.codings.gp.GPArea; @@ -168,8 +167,9 @@ public class GPIndividualProgramData extends AbstractEAIndividual implements Int public void SetProgramPhenotype(InterfaceProgram[] program) { if (program instanceof AbstractGPNode[]) { this.m_Phenotype = new AbstractGPNode[program.length]; - for (int i = 0; i < this.m_Phenotype.length; i++) + for (int i = 0; i < this.m_Phenotype.length; i++) { this.m_Phenotype[i] = (AbstractGPNode)((AbstractGPNode)program[i]).clone(); + } } } @@ -181,8 +181,9 @@ public class GPIndividualProgramData extends AbstractEAIndividual implements Int this.SetProgramPhenotype(program); if (program instanceof AbstractGPNode[]) { this.m_Genotype = new AbstractGPNode[program.length]; - for (int i = 0; i < this.m_Genotype.length; i++) + for (int i = 0; i < this.m_Genotype.length; i++) { this.m_Genotype[i] = (AbstractGPNode)((AbstractGPNode)program[i]).clone(); + } } } @@ -233,9 +234,13 @@ public class GPIndividualProgramData extends AbstractEAIndividual implements Int String result = ""; result += "GPIndividual coding program: ("; result += "Fitness {"; - for (int i = 0; i < this.m_Fitness.length; i++) result += this.m_Fitness[i] + ";"; + for (int i = 0; i < this.m_Fitness.length; i++) { + result += this.m_Fitness[i] + ";"; + } result += "}/SelProb{"; - for (int i = 0; i < this.m_SelectionProbability.length; i++) result += this.m_SelectionProbability[i] + ";"; + for (int i = 0; i < this.m_SelectionProbability.length; i++) { + result += this.m_SelectionProbability[i] + ";"; + } result += "})\n Value: "; for (int i = 0; i < this.m_Genotype.length; i++) { if (this.m_Genotype[i] != null) result += this.m_Genotype[i].getStringRepresentation(); diff --git a/src/eva2/server/go/individuals/IndividualDistanceComparator.java b/src/eva2/server/go/individuals/IndividualDistanceComparator.java index 084cd5d6..0b28355e 100644 --- a/src/eva2/server/go/individuals/IndividualDistanceComparator.java +++ b/src/eva2/server/go/individuals/IndividualDistanceComparator.java @@ -1,10 +1,9 @@ package eva2.server.go.individuals; +import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; import java.io.Serializable; import java.util.Comparator; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; - /** * Compare two AbstractEAIndividuals by their distance to a reference individual. * Usable to sort by a distance. diff --git a/src/eva2/server/go/individuals/IndividualWeightedFitnessComparator.java b/src/eva2/server/go/individuals/IndividualWeightedFitnessComparator.java index aa4f6f7a..f7f019d5 100644 --- a/src/eva2/server/go/individuals/IndividualWeightedFitnessComparator.java +++ b/src/eva2/server/go/individuals/IndividualWeightedFitnessComparator.java @@ -1,10 +1,9 @@ package eva2.server.go.individuals; +import eva2.tools.EVAERROR; import java.io.Serializable; import java.util.Comparator; -import eva2.tools.EVAERROR; - /** * Compare two individuals based on a linear combination of the fitness values. * diff --git a/src/eva2/server/go/individuals/OBGAIndividualPermutationData.java b/src/eva2/server/go/individuals/OBGAIndividualPermutationData.java index b8a2f95b..b7d2dd63 100644 --- a/src/eva2/server/go/individuals/OBGAIndividualPermutationData.java +++ b/src/eva2/server/go/individuals/OBGAIndividualPermutationData.java @@ -1,13 +1,12 @@ package eva2.server.go.individuals; -import java.util.ArrayList; - import eva2.server.go.operators.crossover.CrossoverOBGAPMX; import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.server.go.operators.mutation.MutateOBGAFlip; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; +import java.util.ArrayList; /** This individual uses a permutation based genotype to code for * permutations. @@ -128,9 +127,13 @@ public class OBGAIndividualPermutationData extends AbstractEAIndividual implemen String result = ""; result += "OBGAIndividual: ("; result += "Fitness {"; - for (int i = 0; i < this.m_Fitness.length; i++) result += this.m_Fitness[i] + ";"; + for (int i = 0; i < this.m_Fitness.length; i++) { + result += this.m_Fitness[i] + ";"; + } result += "}/SelProb{"; - for (int i = 0; i < this.m_SelectionProbability.length; i++) result += this.m_SelectionProbability[i] + ";"; + for (int i = 0; i < this.m_SelectionProbability.length; i++) { + result += this.m_SelectionProbability[i] + ";"; + } result += "})\n Value: "; result += "{"; int[] sizes = this.sizePermutation(); diff --git a/src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java b/src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java index ce86a6e7..128b9a0f 100644 --- a/src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java +++ b/src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java @@ -1,9 +1,8 @@ package eva2.server.go.individuals.codings.ga; -import java.util.BitSet; - import eva2.tools.math.RNG; +import java.util.BitSet; /** This gives the gray coding for double with a variable number of bits for coding @@ -40,7 +39,9 @@ public class GAGrayCodingDouble implements InterfaceGADoubleCoding, java.io.Seri for (int i = 0; i < tmpLocus[1]; i++) { tmpB = refBitSet.get(locus[0]); - for (int j = 1; j <= i; j++) tmpB = tmpB ^ refBitSet.get(locus[0] + j); + for (int j = 1; j <= i; j++) { + tmpB ^= refBitSet.get(locus[0] + j); + } if (tmpB) tmpBitSet.set(i); else tmpBitSet.clear(i); } diff --git a/src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java b/src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java index 7dcef478..ac3f36cc 100644 --- a/src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java +++ b/src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java @@ -40,7 +40,9 @@ public class GAGrayCodingInteger implements InterfaceGAIntegerCoding,java.io.Ser // } for (int i = 0; i < tmpLocus[1]; i++) { tmpB = refBitSet.get(locus[0]); - for (int j = 1; j <= i; j++) tmpB = tmpB ^ refBitSet.get(locus[0] + j); + for (int j = 1; j <= i; j++) { + tmpB ^= refBitSet.get(locus[0] + j); + } if (tmpB) tmpBitSet.set(i); else tmpBitSet.clear(i); } diff --git a/src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java b/src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java index 3bcb7b4c..bcf50fb8 100644 --- a/src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java +++ b/src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java @@ -128,7 +128,7 @@ public class GAStandardCodingDouble implements InterfaceGADoubleCoding, java.io. //System.out.println("set 0"); } counter++; - tmpV = tmpV / 2; + tmpV /= 2; // with this method the least significant bit will be at the lowest position } //System.out.print("FLOAT Value coded : " + value + " " + this.printBitSet(tmpBitSet, m_length)); diff --git a/src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java b/src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java index 6c20530f..5a6ee11d 100644 --- a/src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java +++ b/src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java @@ -1,9 +1,8 @@ package eva2.server.go.individuals.codings.ga; -import java.util.BitSet; - import eva2.tools.math.RNG; +import java.util.BitSet; /** The traditional binary coding for integer number, no variable number of bits here, sorry. @@ -50,7 +49,7 @@ public class GAStandardCodingInteger implements InterfaceGAIntegerCoding, java.i } } //System.out.println(tmpV); - tmpV = tmpV + u_min; + tmpV += u_min; //System.out.println("Korregiere: " + tmpV + " " + u_min + " " + u_max + " " + output); if (tmpV > u_max) { // this value is invalid @@ -106,7 +105,7 @@ public class GAStandardCodingInteger implements InterfaceGAIntegerCoding, java.i //System.out.println("set 0"); } counter++; - tmpV = tmpV / 2; + tmpV /= 2; // with this method the least significant bit will be at the lowest position } //System.out.println("tmpV " + tmpOut + " Range("+m_min+";"+m_max+") "+m_length+" "+this.printBitSet(tmpBitSet,m_length)); diff --git a/src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java b/src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java index d45dccbd..fc105106 100644 --- a/src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java +++ b/src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java @@ -1,10 +1,6 @@ package eva2.server.go.individuals.codings.gp; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Vector; - import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; import eva2.server.go.problems.GPFunctionProblem; @@ -13,6 +9,9 @@ import eva2.tools.Pair; import eva2.tools.ReflectPackage; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Vector; /** This gives an abstract node, with default functionality for get and set methods. @@ -69,7 +68,9 @@ public abstract class AbstractGPNode implements InterfaceProgram, java.io.Serial this.m_Depth = node.m_Depth; this.m_Parent = node.m_Parent; this.m_Nodes = new AbstractGPNode[node.m_Nodes.length]; - for (int i = 0; i < node.m_Nodes.length; i++) this.m_Nodes[i] = (AbstractGPNode) node.m_Nodes[i].clone(); + for (int i = 0; i < node.m_Nodes.length; i++) { + this.m_Nodes[i] = (AbstractGPNode) node.m_Nodes[i].clone(); + } } private static void appendStringRepresentation(AbstractGPNode node, StringBuffer sbuf) { @@ -206,7 +207,9 @@ public abstract class AbstractGPNode implements InterfaceProgram, java.io.Serial else if (nodes.length==1) return op+"(" + nodes[0].getStringRepresentation()+")"; else { String result = "( "+nodes[0].getStringRepresentation(); - for (int i = 1; i < nodes.length; i++) result += " " + op + " " + nodes[i].getStringRepresentation(); + for (int i = 1; i < nodes.length; i++) { + result += " " + op + " " + nodes[i].getStringRepresentation(); + } result += ")"; return result; } @@ -386,7 +389,9 @@ public abstract class AbstractGPNode implements InterfaceProgram, java.io.Serial */ public void addNodesTo(ArrayList ListOfNodes) { ListOfNodes.add(this); - for (int i = 0; i < this.m_Nodes.length; i++) this.m_Nodes[i].addNodesTo(ListOfNodes); + for (int i = 0; i < this.m_Nodes.length; i++) { + this.m_Nodes[i].addNodesTo(ListOfNodes); + } } /** @@ -430,7 +435,9 @@ public abstract class AbstractGPNode implements InterfaceProgram, java.io.Serial this.m_Parent = parent; if (parent != null) this.m_Depth = this.m_Parent.getDepth()+1; else this.m_Depth = 0; - for (int i = 0; i < this.m_Nodes.length; i++) this.m_Nodes[i].connect(this); + for (int i = 0; i < this.m_Nodes.length; i++) { + this.m_Nodes[i].connect(this); + } } /** This method will simply init the array of nodes @@ -474,7 +481,9 @@ public abstract class AbstractGPNode implements InterfaceProgram, java.io.Serial */ public int getNumberOfNodes() { int result = 1; - for (int i = 0; i < this.m_Nodes.length; i++) result += this.m_Nodes[i].getNumberOfNodes(); + for (int i = 0; i < this.m_Nodes.length; i++) { + result += this.m_Nodes[i].getNumberOfNodes(); + } return result; } @@ -534,7 +543,9 @@ public abstract class AbstractGPNode implements InterfaceProgram, java.io.Serial } } else { // else i call the method on my followup nodes - for (int i = 0; i < this.m_Nodes.length; i++) this.m_Nodes[i].repairMaxDepth(area, depth); + for (int i = 0; i < this.m_Nodes.length; i++) { + this.m_Nodes[i].repairMaxDepth(area, depth); + } } } diff --git a/src/eva2/server/go/individuals/codings/gp/GPArea.java b/src/eva2/server/go/individuals/codings/gp/GPArea.java index b5cb416a..349432db 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPArea.java +++ b/src/eva2/server/go/individuals/codings/gp/GPArea.java @@ -1,12 +1,11 @@ package eva2.server.go.individuals.codings.gp; +import eva2.tools.math.RNG; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.ArrayList; -import eva2.tools.math.RNG; - /** This class gives the area of GPNodes for a GP problem. The area gives * the range of possible nodes to select from for a GP. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java b/src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java index 5d03f454..092ab175 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java @@ -1,7 +1,6 @@ package eva2.server.go.individuals.codings.gp; -import java.util.ArrayList; import eva2.server.go.problems.InterfaceProgramProblem; diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java b/src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java index 95b5dd95..a41d51e7 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java @@ -68,7 +68,7 @@ public class GPNodeDiv extends AbstractGPNode implements java.io.Serializable { if (tmpValue < 0) tmpValue = -this.m_LowerBorderForSec; else tmpValue = this.m_LowerBorderForSec; } - result = result / tmpValue; + result /= tmpValue; } return new Double(result); } diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeMult.java b/src/eva2/server/go/individuals/codings/gp/GPNodeMult.java index 61206150..91b7c4e1 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeMult.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeMult.java @@ -52,7 +52,7 @@ public class GPNodeMult extends AbstractGPNode implements java.io.Serializable { for (int i = 0; i < this.m_Nodes.length; i++) { tmpObj = this.m_Nodes[i].evaluate(environment); - if (tmpObj instanceof Double) result = result * ((Double)tmpObj).doubleValue(); + if (tmpObj instanceof Double) result *= ((Double)tmpObj).doubleValue(); else System.err.println("Unexpected type returned in evaluate for "+this.getClass().getSimpleName()); } return new Double(result); diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeProd.java b/src/eva2/server/go/individuals/codings/gp/GPNodeProd.java index dac9e384..1cf87661 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeProd.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeProd.java @@ -45,7 +45,9 @@ public class GPNodeProd extends AbstractGPNode implements java.io.Serializable { if (tmpObj instanceof double[]) result*=Mathematics.product((double[])tmpObj); else if (tmpObj instanceof Double[]) { Double[] vals = (Double[])tmpObj; - for (int j=0; j 1) newC[i][j] = newC[i][j]/(double)numbOfAssigned[i]; + if (numbOfAssigned[i] > 1) newC[i][j] /= (double)numbOfAssigned[i]; //else System.out.println("Someone was not assigned any data!? "+ i +" "+numbOfAssigned[i] + ": Data.size()="+data.length); } } @@ -226,7 +228,9 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab // now expand to the expected format (unclustered indies at pop of index 0) int largeEnough = 0; // count clusters that are large enough - for (int i=0; i=getMinClustSize()) largeEnough++; + for (int i=0; i=getMinClustSize()) largeEnough++; + } Population[] resExpanded = new Population[largeEnough+1]; resExpanded[0]=pop.cloneWithoutInds(); int lastIndex = 1; diff --git a/src/eva2/server/go/operators/cluster/ClusteringNearestBetter.java b/src/eva2/server/go/operators/cluster/ClusteringNearestBetter.java index 0944c0cc..0180466e 100644 --- a/src/eva2/server/go/operators/cluster/ClusteringNearestBetter.java +++ b/src/eva2/server/go/operators/cluster/ClusteringNearestBetter.java @@ -14,7 +14,6 @@ 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 eva2.tools.Pair; /** * Hierarchical clustering after Preuss et al., "Counteracting Genetic Drift and Disruptive Recombination @@ -200,7 +199,9 @@ public class ClusteringNearestBetter implements InterfaceClustering, Serializabl if (uplink==null || (uplink.length!=pop.size())) uplink = new int[pop.size()]; // parent index of all indys if (uplinkDist==null || (uplinkDist.length!=pop.size())) uplinkDist = new double[pop.size()]; // parent distance for all indys if (children==null || (children.length!=pop.size())) children = new Vector[pop.size()]; // list of children for all indies - else if (children.length==pop.size()) for (int i=0; i= 1) probs[i] = 1; } diff --git a/src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java b/src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java index fff64f7f..9053573e 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java @@ -71,7 +71,9 @@ public class CrossoverESArithmetical implements InterfaceCrossover, java.io.Seri alpha[j] = RNG.randomDouble(0,1); sum += alpha[j]; } - for (int j = 0; j this.m_Weights.length) { double[] newWeights = new double[d.length]; - for (int i = 0; i < this.m_Weights.length; i++) newWeights[i] = this.m_Weights[i]; + for (int i = 0; i < this.m_Weights.length; i++) { + newWeights[i] = this.m_Weights[i]; + } this.m_Weights = newWeights; } else { double[] newWeights = new double[d.length]; - for (int i = 0; i < d.length; i++) newWeights[i] = this.m_Weights[i]; + for (int i = 0; i < d.length; i++) { + newWeights[i] = this.m_Weights[i]; + } this.m_Weights = newWeights; } } @@ -93,7 +101,9 @@ public class PropertyCrossoverMixer implements java.io.Serializable { } public void setWeights(double[] d) { this.m_Weights = d; - for (int i = 0; i < this.m_Weights.length; i++) this.m_Weights[i] = Math.abs(this.m_Weights[i]); + for (int i = 0; i < this.m_Weights.length; i++) { + this.m_Weights[i] = Math.abs(this.m_Weights[i]); + } } /** This method allows you to set/get the descriptive string @@ -123,7 +133,7 @@ public class PropertyCrossoverMixer implements java.io.Serializable { } if (sum > 0) { for (int i = 0; i < this.m_Weights.length; i++) { - this.m_Weights[i] = this.m_Weights[i]/sum; + this.m_Weights[i] /= sum; } } } diff --git a/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java b/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java index e9a36c10..d5682ca1 100644 --- a/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java +++ b/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java @@ -1,6 +1,12 @@ package eva2.server.go.operators.crossover; +import eva2.gui.GenericObjectEditor; +import eva2.gui.PropertyEditorProvider; +import eva2.server.go.tools.AbstractObjectEditor; +import eva2.server.go.tools.GeneralGEOFaker; +import eva2.server.go.tools.GeneralGOEProperty; +import eva2.tools.BasicResourceLoader; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; @@ -20,7 +26,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; @@ -32,13 +37,6 @@ import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.SwingConstants; -import eva2.gui.GenericObjectEditor; -import eva2.gui.PropertyEditorProvider; -import eva2.server.go.tools.AbstractObjectEditor; -import eva2.server.go.tools.GeneralGEOFaker; -import eva2.server.go.tools.GeneralGOEProperty; -import eva2.tools.BasicResourceLoader; - /** * Created by IntelliJ IDEA. @@ -163,7 +161,9 @@ public class PropertyCrossoverMixerEditor extends JPanel implements PropertyEdit this.m_Targets = new JComponent[list.length]; this.m_Delete = new JButton[list.length]; String[] cups = new String[8]; - for (int i = 0; i < cups.length; i++) cups[i] = ""+(i+1); + for (int i = 0; i < cups.length; i++) { + cups[i] = ""+(i+1); + } // The head title gbc.anchor = GridBagConstraints.WEST; gbc.fill = GridBagConstraints.BOTH; diff --git a/src/eva2/server/go/operators/crossover/TestESCrossover.java b/src/eva2/server/go/operators/crossover/TestESCrossover.java index 371a5f54..1b674e04 100644 --- a/src/eva2/server/go/operators/crossover/TestESCrossover.java +++ b/src/eva2/server/go/operators/crossover/TestESCrossover.java @@ -5,7 +5,6 @@ import javax.swing.*; import eva2.gui.JParaPanel; import eva2.gui.Plot; -import eva2.server.go.SwingWorker; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.ESIndividualDoubleData; import eva2.server.go.individuals.InterfaceDataTypeDouble; diff --git a/src/eva2/server/go/operators/distancemetric/EuclideanMetric.java b/src/eva2/server/go/operators/distancemetric/EuclideanMetric.java index 3c5d6637..9f894ae9 100644 --- a/src/eva2/server/go/operators/distancemetric/EuclideanMetric.java +++ b/src/eva2/server/go/operators/distancemetric/EuclideanMetric.java @@ -1,9 +1,8 @@ package eva2.server.go.operators.distancemetric; -import java.io.Serializable; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceDataTypeDouble; +import java.io.Serializable; /** * The Euclidean metric just measures the Euclidean distance based on the default double representation diff --git a/src/eva2/server/go/operators/distancemetric/IndividualDataMetric.java b/src/eva2/server/go/operators/distancemetric/IndividualDataMetric.java index 0caccb1c..1dcd5de0 100644 --- a/src/eva2/server/go/operators/distancemetric/IndividualDataMetric.java +++ b/src/eva2/server/go/operators/distancemetric/IndividualDataMetric.java @@ -3,7 +3,6 @@ package eva2.server.go.operators.distancemetric; import java.io.Serializable; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.server.go.strategies.ParticleSwarmOptimization; import eva2.tools.EVAERROR; diff --git a/src/eva2/server/go/operators/distancemetric/ObjectiveSpaceMetric.java b/src/eva2/server/go/operators/distancemetric/ObjectiveSpaceMetric.java index 4c24fe39..27191315 100644 --- a/src/eva2/server/go/operators/distancemetric/ObjectiveSpaceMetric.java +++ b/src/eva2/server/go/operators/distancemetric/ObjectiveSpaceMetric.java @@ -1,7 +1,6 @@ package eva2.server.go.operators.distancemetric; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; /** Objective space metric suited for multi-objective optimization. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java b/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java index 75204958..1b4cdb64 100644 --- a/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java +++ b/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java @@ -11,7 +11,6 @@ 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 eva2.server.go.individuals.codings.gp.InterfaceProgram; /** * A phenotype metric suited for the most common data types. @@ -56,8 +55,12 @@ public class PhenotypeMetric implements InterfaceDistanceMetric, java.io.Seriali d = new int[n+1][m+1]; // Step 2 - for (i = 0; i <= n; i++) d[i][0] = i; - for (j = 0; j <= m; j++) d[0][j] = j; + for (i = 0; i <= n; i++) { + d[i][0] = i; + } + for (j = 0; j <= m; j++) { + d[0][j] = j; + } // Step 3 for (i = 1; i <= n; i++) { @@ -130,8 +133,12 @@ public class PhenotypeMetric implements InterfaceDistanceMetric, java.io.Seriali for (int p = 0; p < ((InterfaceDataTypePermutation) indy1).getPermutationData().length; p++) { dIndy1 = ((InterfaceDataTypePermutation) indy1).getPermutationData()[p]; dIndy2 = ((InterfaceDataTypePermutation) indy2).getPermutationData()[p]; - for (int i = 0; i < dIndy1.length; i++) s1 += dIndy1[i]; - for (int i = 0; i < dIndy2.length; i++) s2 += dIndy2[i]; + for (int i = 0; i < dIndy1.length; i++) { + s1 += dIndy1[i]; + } + for (int i = 0; i < dIndy2.length; i++) { + s2 += dIndy2[i]; + } result += PhenotypeMetric.computeLevenshteinDistance(s1, s2)/((double)Math.max(s1.length(), s2.length())); } } @@ -167,7 +174,7 @@ public class PhenotypeMetric implements InterfaceDistanceMetric, java.io.Seriali for (int i = 0; (i < ((InterfaceDataTypeBinary)indy).size()) ; i++) { if (bs.get(i)) result += 1; } - result = result/((InterfaceDataTypeBinary)indy).size(); + result /= ((InterfaceDataTypeBinary)indy).size(); return result; } if (indy instanceof InterfaceDataTypeInteger) { diff --git a/src/eva2/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java b/src/eva2/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java index 5367eaae..ce2a397c 100644 --- a/src/eva2/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java +++ b/src/eva2/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java @@ -33,7 +33,9 @@ public class FitnessAdaptiveClustering implements java.io.Serializable, Interfac double[] result = new double[data.length]; for (int x = 0; x < data[0].length; x++) { - for (int i = 0; i < data.length; i++) data[i][x] = -data[i][x]; + for (int i = 0; i < data.length; i++) { + data[i][x] = -data[i][x]; + } for (int i = 0; i < data.length; i++) { if (data[i][x] < min) min = data[i][x] ; } @@ -50,7 +52,7 @@ public class FitnessAdaptiveClustering implements java.io.Serializable, Interfac for (int i = 1; i < ClusterResult.length; i++) { cluster = ClusterResult[i]; for (int j = 0; j < cluster.size(); j++) { - result[i] = result[i]/((double)cluster.size()); + result[i] /= ((double)cluster.size()); } } diff --git a/src/eva2/server/go/operators/fitnessmodifier/FitnessSharing.java b/src/eva2/server/go/operators/fitnessmodifier/FitnessSharing.java index 89f250f5..14c2728e 100644 --- a/src/eva2/server/go/operators/fitnessmodifier/FitnessSharing.java +++ b/src/eva2/server/go/operators/fitnessmodifier/FitnessSharing.java @@ -35,7 +35,9 @@ public class FitnessSharing implements java.io.Serializable, InterfaceFitnessMod AbstractEAIndividual tmpIndy; for (int x = 0; x < data[0].length; x++) { - for (int i = 0; i < data.length; i++) data[i][x] = -data[i][x]; + for (int i = 0; i < data.length; i++) { + data[i][x] = -data[i][x]; + } for (int i = 0; i < data.length; i++) { if (data[i][x] < min) min = data[i][x]; } @@ -54,7 +56,7 @@ public class FitnessSharing implements java.io.Serializable, InterfaceFitnessMod fitnessSharing += 1 - (this.m_Metric.distance(tmpIndy, (AbstractEAIndividual)population.get(j))/this.m_SharingDistance); } } - result[i] = result[i]/fitnessSharing; + result[i] /= fitnessSharing; } for (int i = 0; i < population.size(); i++) { diff --git a/src/eva2/server/go/operators/initialization/GAGIInitializeSegmentwise.java b/src/eva2/server/go/operators/initialization/GAGIInitializeSegmentwise.java index a9f0a8f7..e74aba1d 100644 --- a/src/eva2/server/go/operators/initialization/GAGIInitializeSegmentwise.java +++ b/src/eva2/server/go/operators/initialization/GAGIInitializeSegmentwise.java @@ -2,9 +2,7 @@ package eva2.server.go.operators.initialization; import java.util.BitSet; -import eva2.gui.BeanInspector; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.GIIndividualIntegerData; import eva2.server.go.individuals.InterfaceGAIndividual; import eva2.server.go.individuals.InterfaceGIIndividual; import eva2.server.go.problems.InterfaceOptimizationProblem; diff --git a/src/eva2/server/go/operators/migration/MOBestMigration.java b/src/eva2/server/go/operators/migration/MOBestMigration.java index 09b640d3..9288deec 100644 --- a/src/eva2/server/go/operators/migration/MOBestMigration.java +++ b/src/eva2/server/go/operators/migration/MOBestMigration.java @@ -1,6 +1,5 @@ package eva2.server.go.operators.migration; -import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.selection.InterfaceSelection; import eva2.server.go.operators.selection.SelectMOMaxiMin; import eva2.server.go.populations.Population; diff --git a/src/eva2/server/go/operators/migration/MOXMeansSeparation.java b/src/eva2/server/go/operators/migration/MOXMeansSeparation.java index dd1398f9..3a9aa175 100644 --- a/src/eva2/server/go/operators/migration/MOXMeansSeparation.java +++ b/src/eva2/server/go/operators/migration/MOXMeansSeparation.java @@ -6,7 +6,6 @@ import java.io.*; import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingAllDominating; import eva2.server.go.operators.archiving.ArchivingNSGAII; import eva2.server.go.operators.cluster.ClusteringXMeans; import eva2.server.go.operators.constraint.ConstBelongsToDifferentClass; @@ -16,7 +15,6 @@ import eva2.server.go.populations.Population; import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.strategies.MultiObjectiveEA; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; diff --git a/src/eva2/server/go/operators/migration/SOMONoMigration.java b/src/eva2/server/go/operators/migration/SOMONoMigration.java index 30eaa046..2152804e 100644 --- a/src/eva2/server/go/operators/migration/SOMONoMigration.java +++ b/src/eva2/server/go/operators/migration/SOMONoMigration.java @@ -1,8 +1,5 @@ package eva2.server.go.operators.migration; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectMOMaxiMin; -import eva2.server.go.populations.Population; import eva2.server.go.strategies.InterfaceOptimizer; /** Implements no migration as reference. diff --git a/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java b/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java index 973ecef9..f6a7bd38 100644 --- a/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java +++ b/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java @@ -60,8 +60,9 @@ public class MOSODynamicallyWeightedFitness implements InterfaceMOSOConverter, j weights[0] = Math.pow(Math.sin(2*Math.PI*(double)this.m_CurrentGeneration/this.m_F), 2); weights[1] = 1 - weights[0]; - for (int i = 0; (i <2) && (i < tmpFit.length); i++) + for (int i = 0; (i <2) && (i < tmpFit.length); i++) { resultFit[0] += tmpFit[i]*weights[i]; + } indy.setFitness(resultFit); } diff --git a/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java b/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java index 59e57c95..b9eb910f 100644 --- a/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java +++ b/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java @@ -19,7 +19,9 @@ public class MOSOEpsilonConstraint implements InterfaceMOSOConverter, java.io.Se this.m_EpsilonConstraint = new PropertyEpsilonConstraint(); this.m_EpsilonConstraint.m_OptimizeObjective = 0; double[] tmpD = new double[2]; - for (int i = 0; i < tmpD.length; i++) tmpD[i] = 0.0; + for (int i = 0; i < tmpD.length; i++) { + tmpD[i] = 0.0; + } this.m_EpsilonConstraint.m_TargetValue = tmpD; } diff --git a/src/eva2/server/go/operators/moso/MOSOEpsilonThreshold.java b/src/eva2/server/go/operators/moso/MOSOEpsilonThreshold.java index 8341450e..6c74af14 100644 --- a/src/eva2/server/go/operators/moso/MOSOEpsilonThreshold.java +++ b/src/eva2/server/go/operators/moso/MOSOEpsilonThreshold.java @@ -1,6 +1,5 @@ package eva2.server.go.operators.moso; -import eva2.gui.PropertyDoubleArray; import eva2.gui.PropertyEpsilonThreshold; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; @@ -20,10 +19,14 @@ public class MOSOEpsilonThreshold implements InterfaceMOSOConverter, java.io.Ser this.m_EpsilonThreshold = new PropertyEpsilonThreshold(); this.m_EpsilonThreshold.m_OptimizeObjective = 0; double[] tmpD = new double[2]; - for (int i = 0; i < tmpD.length; i++) tmpD[i] = 0.0; + for (int i = 0; i < tmpD.length; i++) { + tmpD[i] = 0.0; + } this.m_EpsilonThreshold.m_TargetValue = tmpD; tmpD = new double[2]; - for (int i = 0; i < tmpD.length; i++) tmpD[i] = 1.0; + for (int i = 0; i < tmpD.length; i++) { + tmpD[i] = 1.0; + } this.m_EpsilonThreshold.m_Punishment = tmpD; } diff --git a/src/eva2/server/go/operators/moso/MOSOGoalProgramming.java b/src/eva2/server/go/operators/moso/MOSOGoalProgramming.java index 40460008..31575c30 100644 --- a/src/eva2/server/go/operators/moso/MOSOGoalProgramming.java +++ b/src/eva2/server/go/operators/moso/MOSOGoalProgramming.java @@ -17,7 +17,9 @@ public class MOSOGoalProgramming implements InterfaceMOSOConverter, java.io.Seri public MOSOGoalProgramming() { double[] tmpD = new double[2]; - for (int i = 0; i < tmpD.length; i++) tmpD[i] = 0.0; + for (int i = 0; i < tmpD.length; i++) { + tmpD[i] = 0.0; + } this.m_Goals = new PropertyDoubleArray(tmpD); } public MOSOGoalProgramming(MOSOGoalProgramming b) { @@ -55,8 +57,9 @@ public class MOSOGoalProgramming implements InterfaceMOSOConverter, java.io.Seri tmpFit = indy.getFitness(); indy.putData("MOFitness", tmpFit); resultFit[0] = 0; - for (int i = 0; (i < this.m_Goals.getNumRows()) && (i < tmpFit.length) ; i++) + for (int i = 0; (i < this.m_Goals.getNumRows()) && (i < tmpFit.length) ; i++) { resultFit[0] += tmpFit[i]-this.m_Goals.getValue(i, 0); + } indy.setFitness(resultFit); } @@ -69,8 +72,12 @@ public class MOSOGoalProgramming implements InterfaceMOSOConverter, java.io.Seri public void setOutputDimension(int dim) { double[] newWeights = new double[dim]; - for (int i = 0; i < newWeights.length; i++) newWeights[i] = 0.0; - for (int i = 0; (i < this.m_Goals.getNumRows()) && (i < newWeights.length); i++) newWeights[i] = this.m_Goals.getValue(i,0); + for (int i = 0; i < newWeights.length; i++) { + newWeights[i] = 0.0; + } + for (int i = 0; (i < this.m_Goals.getNumRows()) && (i < newWeights.length); i++) { + newWeights[i] = this.m_Goals.getValue(i,0); + } this.m_Goals.setDoubleArray(newWeights); } diff --git a/src/eva2/server/go/operators/moso/MOSOLpMetric.java b/src/eva2/server/go/operators/moso/MOSOLpMetric.java index f2da194c..ca916dd8 100644 --- a/src/eva2/server/go/operators/moso/MOSOLpMetric.java +++ b/src/eva2/server/go/operators/moso/MOSOLpMetric.java @@ -18,7 +18,9 @@ public class MOSOLpMetric implements InterfaceMOSOConverter, java.io.Serializabl public MOSOLpMetric() { double[] tmpD = new double[2]; - for (int i = 0; i < tmpD.length; i++) tmpD[i] = 0.0; + for (int i = 0; i < tmpD.length; i++) { + tmpD[i] = 0.0; + } this.m_Reference = new PropertyDoubleArray(tmpD); } public MOSOLpMetric(MOSOLpMetric b) { @@ -83,8 +85,12 @@ public class MOSOLpMetric implements InterfaceMOSOConverter, java.io.Serializabl public void setOutputDimension(int dim) { double[] newWeights = new double[dim]; - for (int i = 0; i < newWeights.length; i++) newWeights[i] = 0.0; - for (int i = 0; (i < this.m_Reference.getNumRows()) && (i < newWeights.length); i++) newWeights[i] = this.m_Reference.getValue(i,0); + for (int i = 0; i < newWeights.length; i++) { + newWeights[i] = 0.0; + } + for (int i = 0; (i < this.m_Reference.getNumRows()) && (i < newWeights.length); i++) { + newWeights[i] = this.m_Reference.getValue(i,0); + } this.m_Reference.setDoubleArray(newWeights); } diff --git a/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java b/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java index fc81b354..aef57c1e 100644 --- a/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java +++ b/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java @@ -31,7 +31,9 @@ public class MOSOMOGARankBased implements InterfaceMOSOConverter, java.io.Serial @Override public void convertMultiObjective2SingleObjective(Population pop) { int[] MOGARank = new int[pop.size()]; - for (int i = 0; i < MOGARank.length; i++) MOGARank[i] = 1; + for (int i = 0; i < MOGARank.length; i++) { + MOGARank[i] = 1; + } for (int i = 0; i < pop.size()-1; i++) { for (int j = 0; j < pop.size(); j++) { if (i != j) { diff --git a/src/eva2/server/go/operators/moso/MOSONoConvert.java b/src/eva2/server/go/operators/moso/MOSONoConvert.java index 69413278..54d75c64 100644 --- a/src/eva2/server/go/operators/moso/MOSONoConvert.java +++ b/src/eva2/server/go/operators/moso/MOSONoConvert.java @@ -2,7 +2,6 @@ package eva2.server.go.operators.moso; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSORandomWeight.java b/src/eva2/server/go/operators/moso/MOSORandomWeight.java index 1fd7ee24..547dbb41 100644 --- a/src/eva2/server/go/operators/moso/MOSORandomWeight.java +++ b/src/eva2/server/go/operators/moso/MOSORandomWeight.java @@ -1,6 +1,5 @@ package eva2.server.go.operators.moso; -import eva2.gui.PropertyDoubleArray; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; import eva2.tools.math.RNG; @@ -54,12 +53,17 @@ public class MOSORandomWeight implements InterfaceMOSOConverter, java.io.Seriali sum += tmpWeight[i]; } if (sum <= 0.0000001) { - for (int i = 0; i < tmpWeight.length; i++) tmpWeight[i] = 1/(double)tmpWeight.length; + for (int i = 0; i < tmpWeight.length; i++) { + tmpWeight[i] = 1/(double)tmpWeight.length; + } } else { - for (int i = 0; i < tmpWeight.length; i++) tmpWeight[i] = tmpWeight[i]/sum; + for (int i = 0; i < tmpWeight.length; i++) { + tmpWeight[i] /= sum; + } } - for (int i = 0; (i < tmpWeight.length) && (i < tmpFit.length) ; i++) + for (int i = 0; (i < tmpWeight.length) && (i < tmpFit.length) ; i++) { resultFit[0] += tmpFit[i]*tmpWeight[i]; + } indy.setFitness(resultFit); } diff --git a/src/eva2/server/go/operators/moso/MOSOWeightedFitness.java b/src/eva2/server/go/operators/moso/MOSOWeightedFitness.java index c4e499c7..77b6cb3b 100644 --- a/src/eva2/server/go/operators/moso/MOSOWeightedFitness.java +++ b/src/eva2/server/go/operators/moso/MOSOWeightedFitness.java @@ -17,9 +17,13 @@ public class MOSOWeightedFitness implements InterfaceMOSOConverter, java.io.Seri public MOSOWeightedFitness() { double[][] tmpD = new double[2][1]; - for (int i = 0; i < tmpD.length; i++) tmpD[i][0] = 1.0; + for (int i = 0; i < tmpD.length; i++) { + tmpD[i][0] = 1.0; + } this.m_Weights = new PropertyDoubleArray(tmpD); - for (int i = 0; i < this.m_Weights.getNumRows(); i++) this.m_Weights.normalizeColumns(); + for (int i = 0; i < this.m_Weights.getNumRows(); i++) { + this.m_Weights.normalizeColumns(); + } } public MOSOWeightedFitness(double[][] weights) { @@ -62,8 +66,9 @@ public class MOSOWeightedFitness implements InterfaceMOSOConverter, java.io.Seri tmpFit = indy.getFitness(); indy.putData("MOFitness", tmpFit); - for (int i = 0; (i < this.m_Weights.getNumRows()) && (i < tmpFit.length) ; i++) + for (int i = 0; (i < this.m_Weights.getNumRows()) && (i < tmpFit.length) ; i++) { resultFit[0] += tmpFit[i]*this.m_Weights.getValue(i,0); + } indy.setFitness(resultFit); } @@ -85,8 +90,12 @@ public class MOSOWeightedFitness implements InterfaceMOSOConverter, java.io.Seri public void setOutputDimension(int dim) { double[] newWeights = new double[dim]; - for (int i = 0; i < newWeights.length; i++) newWeights[i] = 1; - for (int i = 0; (i < this.m_Weights.getNumRows()) && (i < newWeights.length); i++) newWeights[i] = this.m_Weights.getValue(i,0); + for (int i = 0; i < newWeights.length; i++) { + newWeights[i] = 1; + } + for (int i = 0; (i < this.m_Weights.getNumRows()) && (i < newWeights.length); i++) { + newWeights[i] = this.m_Weights.getValue(i,0); + } this.m_Weights.setDoubleArray(newWeights); } diff --git a/src/eva2/server/go/operators/moso/MOSOWeightedLPTchebycheff.java b/src/eva2/server/go/operators/moso/MOSOWeightedLPTchebycheff.java index 36ab154e..e84b4127 100644 --- a/src/eva2/server/go/operators/moso/MOSOWeightedLPTchebycheff.java +++ b/src/eva2/server/go/operators/moso/MOSOWeightedLPTchebycheff.java @@ -19,10 +19,14 @@ public class MOSOWeightedLPTchebycheff implements InterfaceMOSOConverter, java.i this.m_WLPT = new PropertyWeightedLPTchebycheff(); this.m_WLPT.m_P = 0; double[] tmpD = new double[2]; - for (int i = 0; i < tmpD.length; i++) tmpD[i] = 0.0; + for (int i = 0; i < tmpD.length; i++) { + tmpD[i] = 0.0; + } this.m_WLPT.m_IdealValue = tmpD; tmpD = new double[2]; - for (int i = 0; i < tmpD.length; i++) tmpD[i] = 1.0; + for (int i = 0; i < tmpD.length; i++) { + tmpD[i] = 1.0; + } this.m_WLPT.m_Weights = tmpD; } diff --git a/src/eva2/server/go/operators/mutation/CMAParamSet.java b/src/eva2/server/go/operators/mutation/CMAParamSet.java index 54a85987..de852590 100644 --- a/src/eva2/server/go/operators/mutation/CMAParamSet.java +++ b/src/eva2/server/go/operators/mutation/CMAParamSet.java @@ -170,7 +170,9 @@ class CMAParamSet implements InterfacePopulationChangedEventListener, Serializab } else theWeights[i] = 1.; sum+=theWeights[i]; } - for (int i=0; i= 1) probs[i] = 1; } diff --git a/src/eva2/server/go/operators/mutation/MutateESCorrVector.java b/src/eva2/server/go/operators/mutation/MutateESCorrVector.java index c6d605cf..8ffe7732 100644 --- a/src/eva2/server/go/operators/mutation/MutateESCorrVector.java +++ b/src/eva2/server/go/operators/mutation/MutateESCorrVector.java @@ -7,7 +7,6 @@ import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceESIndividual; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.tools.SelectedTag; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; @@ -172,7 +171,9 @@ public class MutateESCorrVector implements InterfaceMutation, java.io.Serializab if (((AbstractEAIndividual)partners.get(i)).getMutationOperator() instanceof MutateESCorrVector) tmpList.add(new Double(((MutateESCorrVector)((AbstractEAIndividual)partners.get(i)).getMutationOperator()).m_scalingDev)); } double[] list = new double[tmpList.size()]; - for (int i = 0; i < tmpList.size(); i++) list[i] = ((Double)tmpList.get(i)).doubleValue(); + for (int i = 0; i < tmpList.size(); i++) { + list[i] = ((Double)tmpList.get(i)).doubleValue(); + } if (list.length <= 1) return; // discreete mutation for step size this.m_scalingDev = list[RNG.randomInt(0, list.length-1)]; diff --git a/src/eva2/server/go/operators/mutation/MutateESCorrolated.java b/src/eva2/server/go/operators/mutation/MutateESCorrolated.java index 5ef193c7..66f2a1d8 100644 --- a/src/eva2/server/go/operators/mutation/MutateESCorrolated.java +++ b/src/eva2/server/go/operators/mutation/MutateESCorrolated.java @@ -94,12 +94,16 @@ public class MutateESCorrolated implements InterfaceMutation, java.io.Serializab if (this.m_Sigmas == null) { // init the Sigmas this.m_Sigmas = new double[x.length]; - for (int i = 0; i < this.m_Sigmas.length; i++) this.m_Sigmas[i] = this.m_MutationStepSize; + for (int i = 0; i < this.m_Sigmas.length; i++) { + this.m_Sigmas[i] = this.m_MutationStepSize; + } } if (this.m_Alphas == null) { // init the Alphas this.m_Alphas = new double[(x.length*(x.length-1))/2]; - for (int i = 0; i < this.m_Alphas.length; i++) this.m_Alphas[i] = 0.0; + for (int i = 0; i < this.m_Alphas.length; i++) { + this.m_Alphas[i] = 0.0; + } } } } @@ -177,13 +181,13 @@ public class MutateESCorrolated implements InterfaceMutation, java.io.Serializab //Mutate Sigmas for (int i = 0; i < x.length; i++) { - this.m_Sigmas[i] = this.m_Sigmas[i] * Math.exp(this.m_Tau1 * tmpR + this.m_Tau2 * RNG.gaussianDouble(1)); + this.m_Sigmas[i] *= Math.exp(this.m_Tau1 * tmpR + this.m_Tau2 * RNG.gaussianDouble(1)); if (this.m_Sigmas[i] < this.m_LowerLimitStepSize) this.m_Sigmas[i] = this.m_LowerLimitStepSize; } //Mutate Alphas for (int i = 0; i < this.m_Alphas.length; i++) { - this.m_Alphas[i] = this.m_Alphas[i] + RNG.gaussianDouble(0.2); + this.m_Alphas[i] += RNG.gaussianDouble(0.2); if (this.m_Alphas[i] < -Math.PI/2) this.m_Alphas[i] = -Math.PI/2; if (this.m_Alphas[i] > Math.PI/2) this.m_Alphas[i] = Math.PI/2; } diff --git a/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java b/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java index 1d82ef6d..8a5fe05f 100644 --- a/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java +++ b/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java @@ -182,8 +182,9 @@ public class MutateESCovarianceMatrixAdaption implements InterfaceMutation, java double Cij; double Bz_d; double pathLen = 0.0; - for (int i = 0; i < this.m_D; i++) + for (int i = 0; i < this.m_D; i++) { this.s_N[i] = (1.0 - this.m_c) * this.s_N[i] + this.m_c * this.cu * this.Bz[i]; + } // System.out.println("C bef:\n" + m_C.toString()); // ADAPT COVARIANCE for (int i = 0; i range[i][1]) { // undo the step and try new Z - for (int j = 0; j < this.m_D; j++) x[j] = oldX[j] - this.m_SigmaGlobal * this.Bz[j]; + for (int j = 0; j < this.m_D; j++) { + x[j] = oldX[j] - this.m_SigmaGlobal * this.Bz[j]; + } this.m_SigmaGlobal*=0.5; isNewPosFeasible = false; counter++; diff --git a/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaptionPlus.java b/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaptionPlus.java index 9d593ff2..31af4fc6 100644 --- a/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaptionPlus.java +++ b/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaptionPlus.java @@ -165,7 +165,7 @@ public class MutateESCovarianceMatrixAdaptionPlus extends .getEAIndividual(i).getFitness(0)) rate++; } - rate = rate / parentPop.size(); + rate /= parentPop.size(); if (updateSelected) for (int i = 0; i < selectedPop.size(); i++) { // applied to the old @@ -208,9 +208,8 @@ public class MutateESCovarianceMatrixAdaptionPlus extends public void updateStepSize(double psuccess) { this.m_psuccess = (1 - m_cp) * m_psuccess + m_cp * psuccess; - m_SigmaGlobal = m_SigmaGlobal - * Math.exp(1 / m_stepd * (m_psuccess - m_psuccesstarget) - / (1 - m_psuccesstarget)); + m_SigmaGlobal *= Math.exp(1 / m_stepd * (m_psuccess - m_psuccesstarget) + / (1 - m_psuccesstarget)); } @Override diff --git a/src/eva2/server/go/operators/mutation/MutateESGlobal.java b/src/eva2/server/go/operators/mutation/MutateESGlobal.java index e41fdd23..f85a2f0a 100644 --- a/src/eva2/server/go/operators/mutation/MutateESGlobal.java +++ b/src/eva2/server/go/operators/mutation/MutateESGlobal.java @@ -9,7 +9,6 @@ import eva2.server.go.individuals.InterfaceESIndividual; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.tools.SelectedTag; import eva2.tools.math.RNG; @@ -97,7 +96,7 @@ public class MutateESGlobal implements InterfaceMutation, java.io.Serializable, if (individual instanceof InterfaceESIndividual) { double[] x = ((InterfaceESIndividual)individual).getDGenotype(); double[][] range = ((InterfaceESIndividual)individual).getDoubleRange(); - this.m_MutationStepSize = this.m_MutationStepSize * Math.exp(this.m_Tau1 * RNG.gaussianDouble(1)); + this.m_MutationStepSize *= Math.exp(this.m_Tau1 * RNG.gaussianDouble(1)); if (this.m_MutationStepSize < this.m_LowerLimitStepSize) this.m_MutationStepSize = this.m_LowerLimitStepSize; for (int i = 0; i < x.length; i++) { x[i] += ((range[i][1] -range[i][0])/2)*RNG.gaussianDouble(this.m_MutationStepSize); @@ -124,14 +123,18 @@ public class MutateESGlobal implements InterfaceMutation, java.io.Serializable, if (((AbstractEAIndividual)partners.get(i)).getMutationOperator() instanceof MutateESGlobal) tmpList.add(new Double(((MutateESGlobal)((AbstractEAIndividual)partners.get(i)).getMutationOperator()).m_MutationStepSize)); } double[] list = new double[tmpList.size()]; - for (int i = 0; i < tmpList.size(); i++) list[i] = ((Double)tmpList.get(i)).doubleValue(); + for (int i = 0; i < tmpList.size(); i++) { + list[i] = ((Double)tmpList.get(i)).doubleValue(); + } if (list.length <= 1) return; switch (this.m_CrossoverType) { case intermediate : this.m_MutationStepSize = 0; - for (int i = 0; i < list.length; i++) this.m_MutationStepSize += list[i]; - this.m_MutationStepSize = this.m_MutationStepSize/(double)list.length; + for (int i = 0; i < list.length; i++) { + this.m_MutationStepSize += list[i]; + } + this.m_MutationStepSize /= (double)list.length; break; case discrete : this.m_MutationStepSize = list[RNG.randomInt(0, list.length-1)]; diff --git a/src/eva2/server/go/operators/mutation/MutateESLocal.java b/src/eva2/server/go/operators/mutation/MutateESLocal.java index 5d8deb97..24eba6bd 100644 --- a/src/eva2/server/go/operators/mutation/MutateESLocal.java +++ b/src/eva2/server/go/operators/mutation/MutateESLocal.java @@ -1,8 +1,6 @@ package eva2.server.go.operators.mutation; -import java.util.ArrayList; - import eva2.server.go.PopulationInterface; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceESIndividual; @@ -12,6 +10,7 @@ import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.SelectedTag; import eva2.tools.Tag; import eva2.tools.math.RNG; +import java.util.ArrayList; /** * Created by IntelliJ IDEA. @@ -90,7 +89,9 @@ public class MutateESLocal implements InterfaceMutation, InterfaceAdditionalPopu if (individual instanceof InterfaceESIndividual) { // init the Sigmas this.m_Sigmas = new double[((InterfaceESIndividual)individual).getDGenotype().length]; - for (int i = 0; i < this.m_Sigmas.length; i++) this.m_Sigmas[i] = this.m_MutationStepSize; + for (int i = 0; i < this.m_Sigmas.length; i++) { + this.m_Sigmas[i] = this.m_MutationStepSize; + } } } @@ -108,7 +109,7 @@ public class MutateESLocal implements InterfaceMutation, InterfaceAdditionalPopu double tmpR = RNG.gaussianDouble(1); for (int i = 0; i < x.length; i++) { - this.m_Sigmas[i] = this.m_Sigmas[i] * Math.exp(this.m_Tau1 * tmpR + this.m_Tau2 * RNG.gaussianDouble(1)); + this.m_Sigmas[i] *= Math.exp(this.m_Tau1 * tmpR + this.m_Tau2 * RNG.gaussianDouble(1)); if (this.m_Sigmas[i] < this.m_LowerLimitStepSize) this.m_Sigmas[i] = this.m_LowerLimitStepSize; x[i] += ((range[i][1] -range[i][0])/2)*RNG.gaussianDouble(this.m_Sigmas[i]); if (range[i][0] > x[i]) x[i] = range[i][0]; @@ -148,13 +149,19 @@ public class MutateESLocal implements InterfaceMutation, InterfaceAdditionalPopu switch (this.m_CrossoverType.getSelectedTag().getID()) { case 1 : { this.m_MutationStepSize = 0; - for (int i = 0; i < this.m_Sigmas.length; i++) this.m_Sigmas[i] = 0; + for (int i = 0; i < this.m_Sigmas.length; i++) { + this.m_Sigmas[i] = 0; + } for (int i = 0; i < listA.length; i++) { this.m_MutationStepSize += listA[i]; - for (int j = 0; j < this.m_Sigmas.length; j++) this.m_Sigmas[j] += listB[i][j]; + for (int j = 0; j < this.m_Sigmas.length; j++) { + this.m_Sigmas[j] += listB[i][j]; } - this.m_MutationStepSize = this.m_MutationStepSize/(double)listA.length; - for (int i = 0; i < this.m_Sigmas.length; i++) this.m_Sigmas[i] = this.m_Sigmas[i]/(double)listA.length; + } + this.m_MutationStepSize /= (double)listA.length; + for (int i = 0; i < this.m_Sigmas.length; i++) { + this.m_Sigmas[i] /= (double)listA.length; + } break; } case 2 : { diff --git a/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java b/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java index 99e8ab8a..b1dfae88 100644 --- a/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java +++ b/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java @@ -104,7 +104,9 @@ public class MutateESMainVectorAdaption implements InterfaceMutation, java.io.Se this.m_main_v[i] = 0; }; this.xi_dach = Math.sqrt(this.N - 0.5); - for (int i = 0; i < this.N; i++) this.m_Z[i] = RNG.gaussianDouble(1.0); + for (int i = 0; i < this.N; i++) { + this.m_Z[i] = RNG.gaussianDouble(1.0); + } this.Z1 = RNG.gaussianDouble(1.0); evaluateNewObjectX(x, ranges); } @@ -120,7 +122,9 @@ public class MutateESMainVectorAdaption implements InterfaceMutation, java.io.Se double[] x = ((InterfaceESIndividual)individual).getDGenotype(); double[][] ranges = ((InterfaceESIndividual)individual).getDoubleRange(); this.adaptStrategy(); - for (int i = 0; i < N; i++) m_Z[i] = RNG.gaussianDouble(1.0); + for (int i = 0; i < N; i++) { + m_Z[i] = RNG.gaussianDouble(1.0); + } Z1 = RNG.gaussianDouble(1.0); evaluateNewObjectX(x, ranges); @@ -143,12 +147,14 @@ public class MutateESMainVectorAdaption implements InterfaceMutation, java.io.Se double length = 0.0; for (int i = 0; i < this.N; i++) { this.s_d_N[i] = (1.0 - this.m_c) * this.s_d_N[i] + Math.sqrt(this.m_c*(2.0-this.m_c)) * this.m_Z[i]; // PATH - length = length + this.s_d_N[i] * this.s_d_N[i]; + length += this.s_d_N[i] * this.s_d_N[i]; } - this.m_SigmaScalar = this.m_SigmaScalar * Math.exp(this.m_Beta * this.m_c * (Math.sqrt(length) - this.xi_dach)); + this.m_SigmaScalar *= Math.exp(this.m_Beta * this.m_c * (Math.sqrt(length) - this.xi_dach)); // SIGN OF SCALAR PRODUCT double Product = 0.0; - for (int i = 0; i < this.N; i++) Product = Product + this.s_N[i] * this.m_main_v[i]; + for (int i = 0; i < this.N; i++) { + Product += this.s_N[i] * this.m_main_v[i]; + } if (Product < 0.0) Product = -1.0; else Product = 1.0; for (int i = 0; i < this.N; i++) { // ADAPT MAIN VECTOR @@ -180,14 +186,14 @@ public class MutateESMainVectorAdaption implements InterfaceMutation, java.io.Se double gradl = 0; for (int i=0;i < x.length; i++) { grad[i] = 2*x[i]; - vl = vl + v[i]*v[i]; - gradl = gradl + grad[i]*grad[i]; + vl += v[i]*v[i]; + gradl += grad[i]*grad[i]; } vl = Math.sqrt(vl); gradl = Math.sqrt(gradl); for (int i = 0; i < x.length; i++) { - v[i] = v[i] / vl; grad[i] = grad[i] / gradl; - x[i] = x[i] + this.m_SigmaScalar * (this.m_Z[i] + this.Z1 * this.w_v * this.m_main_v[i]); + v[i] /= vl; grad[i] /= gradl; + x[i] += this.m_SigmaScalar * (this.m_Z[i] + this.Z1 * this.w_v * this.m_main_v[i]); } if (getCheckConstraints()) { // MK: lets actually do a constraint check Mathematics.projectToRange(x, range); diff --git a/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java b/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java index bd1be8f6..92a4f6f8 100644 --- a/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java +++ b/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java @@ -89,9 +89,9 @@ public class MutateESMutativeStepSizeControl implements InterfaceMutation, java. double[] x = ((InterfaceESIndividual)individual).getDGenotype(); double[][] range = ((InterfaceESIndividual)individual).getDoubleRange(); if (RNG.flipCoin(0.5)) - this.m_MutationStepSize = this.m_MutationStepSize * this.m_Alpha; + this.m_MutationStepSize *= this.m_Alpha; else - this.m_MutationStepSize = this.m_MutationStepSize / this.m_Alpha; + this.m_MutationStepSize /= this.m_Alpha; if (this.m_MutationStepSize < this.m_LowerLimitStepSize) this.m_MutationStepSize = this.m_LowerLimitStepSize; if (this.m_MutationStepSize > this.m_UpperLimitStepSize) this.m_MutationStepSize = this.m_UpperLimitStepSize; for (int i = 0; i < x.length; i++) { diff --git a/src/eva2/server/go/operators/mutation/MutateESPathLengthAdaption.java b/src/eva2/server/go/operators/mutation/MutateESPathLengthAdaption.java index 26b5572a..88809869 100644 --- a/src/eva2/server/go/operators/mutation/MutateESPathLengthAdaption.java +++ b/src/eva2/server/go/operators/mutation/MutateESPathLengthAdaption.java @@ -62,9 +62,13 @@ public class MutateESPathLengthAdaption implements InterfaceMutation, java.io.Se if (this.m_SigmaGlobal != mut.m_SigmaGlobal) return false; if (this.m_c != mut.m_c) return false; if ((this.m_randZ != null) && (mut.m_randZ != null)) - for (int i = 0; i < this.m_randZ.length; i++) if (this.m_randZ[i] != mut.m_randZ[i]) return false; + for (int i = 0; i < this.m_randZ.length; i++) { + if (this.m_randZ[i] != mut.m_randZ[i]) return false; + } if ((this.m_Path != null) && (mut.m_Path != null)) - for (int i = 0; i < this.m_Path.length; i++) if (this.m_Path[i] != mut.m_Path[i]) return false; + for (int i = 0; i < this.m_Path.length; i++) { + if (this.m_Path[i] != mut.m_Path[i]) return false; + } return true; } else return false; @@ -129,7 +133,9 @@ public class MutateESPathLengthAdaption implements InterfaceMutation, java.io.Se } private void calculateNewStep() { - for (int i = 0; i < m_dim; i++) m_randZ[i] = RNG.gaussianDouble(1.0); + for (int i = 0; i < m_dim; i++) { + m_randZ[i] = RNG.gaussianDouble(1.0); + } } /** This method allows you to perform either crossover on the strategy parameters @@ -153,12 +159,13 @@ public class MutateESPathLengthAdaption implements InterfaceMutation, java.io.Se // double kappa_d = ((double)m_dim)/4.0+1.0; double exp = (pathLen - expectedPathLen)/(dampening*expectedPathLen); - m_SigmaGlobal = m_SigmaGlobal * Math.exp(exp); + m_SigmaGlobal *= Math.exp(exp); } private void mutateX(double[] x,double[][] range, boolean checkRange) { - for (int i = 0; i < x.length; i++) - x[i] = x[i] + m_SigmaGlobal * m_randZ[i]; + for (int i = 0; i < x.length; i++) { + x[i] += m_SigmaGlobal * m_randZ[i]; + } if (checkRange) checkRange(x, range); } diff --git a/src/eva2/server/go/operators/mutation/MutateESRankMuCMA.java b/src/eva2/server/go/operators/mutation/MutateESRankMuCMA.java index 89cf7a39..cb57a456 100644 --- a/src/eva2/server/go/operators/mutation/MutateESRankMuCMA.java +++ b/src/eva2/server/go/operators/mutation/MutateESRankMuCMA.java @@ -1,7 +1,5 @@ package eva2.server.go.operators.mutation; -import java.io.Serializable; - import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; import eva2.server.go.enums.ESMutationInitialSigma; @@ -14,9 +12,10 @@ import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.server.go.strategies.EvolutionStrategies; import eva2.tools.EVAERROR; import eva2.tools.Pair; +import eva2.tools.math.Jama.EigenvalueDecomposition; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; -import eva2.tools.math.Jama.EigenvalueDecomposition; +import java.io.Serializable; /** * Implementing CMA ES with rank-mu-update and weighted recombination. More information can be found here: @@ -188,7 +187,9 @@ public class MutateESRankMuCMA implements InterfaceAdaptOperatorGenerational, In /* cumulation for sigma (ps) using B*z */ for (int i = 0; i < dim; ++i) { double sum = 0.; - for (int j = 0; j < dim; ++j) sum += params.mB.get(i,j) * zVect[j]; + for (int j = 0; j < dim; ++j) { + sum += params.mB.get(i,j) * zVect[j]; + } newPathS[i] = (1. - params.c_sig) * params.pathS[i] + Math.sqrt(params.c_sig * (2. - params.c_sig)) * sum; if (!checkValidDouble(newPathS[i])) { @@ -325,7 +326,9 @@ public class MutateESRankMuCMA implements InterfaceAdaptOperatorGenerational, In private boolean nearlySame(double[] bestFitness, double[] worstFitness) { double epsilon = 1e-14; - for (int i=0; iepsilon) return false; + for (int i=0; iepsilon) return false; + } return true; } @@ -366,32 +369,33 @@ public class MutateESRankMuCMA implements InterfaceAdaptOperatorGenerational, In /* (only upper triangle!) */ /* update covariance matrix */ //System.out.println("CCov " + getCCov(selected) + " Cc " + getCc() + " muCov " + getMuCov(selected)); - for (int i = 0; i < dim; ++i) + for (int i = 0; i < dim; ++i) { for (int j = 0; j <= i; ++j) { // oldVal = mC.get(i,j); - newVal = (1 - ccv) * params.mC.get(i,j) + newVal = (1 - ccv) * params.mC.get(i,j) + ccv * (1. / mcv) * (newPathC[i] * newPathC[j] + (1 - hsig) * getCc() * (2. - getCc()) * params.mC.get(i,j)); - checkValidDouble(newVal); - params.mC.set(i,j,newVal); - if (isRankMu()) { - for (int k = 0; k < mu; ++k) { - /* - * additional rank mu - * update - */ - // double[] x_k = ((InterfaceDataTypeDouble)selected.getEAIndividual(k)).getDoubleData(); - double[] x_k = AbstractEAIndividual.getDoublePositionShallow(selected.getEAIndividual(k)); - newVal = params.mC.get(i,j)+ ccv * (1 - 1. / mcv) - * params.weights[k] * (x_k[i] - params.meanX[i]) - * (x_k[j] - params.meanX[j]) / (getSigma(params, i) * getSigma(params, j)); // TODO right sigmas? - checkValidDouble(newVal); - params.mC.set(i,j, newVal); - } - } + checkValidDouble(newVal); + params.mC.set(i,j,newVal); + if (isRankMu()) { + for (int k = 0; k < mu; ++k) { + /* + * additional rank mu + * update + */ + // double[] x_k = ((InterfaceDataTypeDouble)selected.getEAIndividual(k)).getDoubleData(); + double[] x_k = AbstractEAIndividual.getDoublePositionShallow(selected.getEAIndividual(k)); + newVal = params.mC.get(i,j)+ ccv * (1 - 1. / mcv) + * params.weights[k] * (x_k[i] - params.meanX[i]) + * (x_k[j] - params.meanX[j]) / (getSigma(params, i) * getSigma(params, j)); // TODO right sigmas? + checkValidDouble(newVal); + params.mC.set(i,j, newVal); + } + } } + } // fill rest of C for (int i = 0; i < dim; ++i) { for (int j = i+1; j < dim; ++j) { @@ -631,7 +635,9 @@ public class MutateESRankMuCMA implements InterfaceAdaptOperatorGenerational, In /* add mutation (sigma * B * (D*z)) */ for (int i = 0; i < x.length; ++i) { double sum = 0.; - for (int j = 0; j < x.length; ++j) sum += params.mB.get(i,j) * sampl[j]; + for (int j = 0; j < x.length; ++j) { + sum += params.mB.get(i,j) * sampl[j]; + } x[i] = params.meanX[i]+getSigma(params, i)*sum; checkValidDouble(x[i]); } @@ -654,7 +660,9 @@ public class MutateESRankMuCMA implements InterfaceAdaptOperatorGenerational, In /* add mutation (sigma * B * (D*z)) */ for (int i = 0; i < dim; ++i) { double sum = 0.; - for (int j = 0; j < dim; ++j) sum += params.mB.get(i,j) * sampl[j]; + for (int j = 0; j < dim; ++j) { + sum += params.mB.get(i,j) * sampl[j]; + } x[i] = params.meanX[i]+getSigma(params, i)*sum; checkValidDouble(x[i]); } diff --git a/src/eva2/server/go/operators/mutation/MutateESSuccessRule.java b/src/eva2/server/go/operators/mutation/MutateESSuccessRule.java index 238bc4d3..a45af9a7 100644 --- a/src/eva2/server/go/operators/mutation/MutateESSuccessRule.java +++ b/src/eva2/server/go/operators/mutation/MutateESSuccessRule.java @@ -1,10 +1,7 @@ package eva2.server.go.operators.mutation; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.tools.math.RNG; /** * Success rule implementation. @@ -66,12 +63,12 @@ public class MutateESSuccessRule extends MutateESFixedStepSize implements Interf /** This method increases the mutation step size. */ public void increaseMutationStepSize() { - this.m_Sigma = this.m_Sigma * this.m_Alpha; + this.m_Sigma *= this.m_Alpha; } /** This method decrease the mutation step size. */ public void decreaseMutationStepSize() { - this.m_Sigma = this.m_Sigma / this.m_Alpha; + this.m_Sigma /= this.m_Alpha; } /********************************************************************************************************************** @@ -143,7 +140,7 @@ public class MutateESSuccessRule extends MutateESFixedStepSize implements Interf // System.out.println("new fit / old fit: " + BeanInspector.toString(newPop.getEAIndividual(i).getFitness()) + " , " + BeanInspector.toString(parentPop.getEAIndividual(i).getFitness())); if (newPop.getEAIndividual(i).getFitness(0) < parentPop.getEAIndividual(i).getFitness(0)) rate++; } - rate = rate / parentPop.size(); + rate /= parentPop.size(); if (updateSelected) for (int i = 0; i < selectedPop.size(); i++) { // applied to the old population as well in case of plus strategy MutateESSuccessRule mutator = (MutateESSuccessRule)((AbstractEAIndividual)selectedPop.get(i)).getMutationOperator(); diff --git a/src/eva2/server/go/operators/mutation/MutateGAAdaptive.java b/src/eva2/server/go/operators/mutation/MutateGAAdaptive.java index 277dce76..759ae077 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAAdaptive.java +++ b/src/eva2/server/go/operators/mutation/MutateGAAdaptive.java @@ -1,13 +1,12 @@ package eva2.server.go.operators.mutation; -import java.util.BitSet; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceGAIndividual; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; +import java.util.BitSet; /** * The mutation probability is adapted using a parameter tau and stored in the individual. @@ -75,7 +74,7 @@ public class MutateGAAdaptive implements InterfaceMutation, java.io.Serializable //System.out.println("Before Mutate: " +((GAIndividual)individual).getSolutionRepresentationFor()); if (individual instanceof InterfaceGAIndividual) { BitSet tmpBitSet = ((InterfaceGAIndividual)individual).getBGenotype(); - this.m_MutationStep = this.m_MutationStep * Math.exp(this.m_Tau1 * RNG.gaussianDouble(1)); + this.m_MutationStep *= Math.exp(this.m_Tau1 * RNG.gaussianDouble(1)); if (this.m_MutationStep < this.m_LowerLimitStepSize) this.m_MutationStep = this.m_LowerLimitStepSize; for (int i = 0; i < ((InterfaceGAIndividual)individual).getGenotypeLength(); i++) { if (RNG.flipCoin(this.m_MutationStep/((InterfaceGAIndividual)individual).getGenotypeLength())) { diff --git a/src/eva2/server/go/operators/mutation/MutateGAGISwapBitsSegmentwise.java b/src/eva2/server/go/operators/mutation/MutateGAGISwapBitsSegmentwise.java index c1106380..eae1edfc 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAGISwapBitsSegmentwise.java +++ b/src/eva2/server/go/operators/mutation/MutateGAGISwapBitsSegmentwise.java @@ -1,8 +1,7 @@ package eva2.server.go.operators.mutation; -import java.io.Serializable; - import eva2.tools.EVAERROR; +import java.io.Serializable; /** * This implementation restricts the swap positions of the standard swapping mutation diff --git a/src/eva2/server/go/operators/mutation/MutateGAShiftSubstring.java b/src/eva2/server/go/operators/mutation/MutateGAShiftSubstring.java index e1be64b3..10ac1d9d 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAShiftSubstring.java +++ b/src/eva2/server/go/operators/mutation/MutateGAShiftSubstring.java @@ -1,13 +1,12 @@ package eva2.server.go.operators.mutation; -import java.util.BitSet; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceGAIndividual; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; +import java.util.BitSet; /** * Shift a certain substring within the individual. The length and shift distance diff --git a/src/eva2/server/go/operators/mutation/MutateGASwapBitsSegmentwise.java b/src/eva2/server/go/operators/mutation/MutateGASwapBitsSegmentwise.java index 91a08634..06e271a3 100644 --- a/src/eva2/server/go/operators/mutation/MutateGASwapBitsSegmentwise.java +++ b/src/eva2/server/go/operators/mutation/MutateGASwapBitsSegmentwise.java @@ -1,14 +1,13 @@ package eva2.server.go.operators.mutation; -import java.util.BitSet; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceGAIndividual; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; +import java.util.BitSet; /** * Swap two random bits of a GA individual within subsequences (segments) of fixed length. diff --git a/src/eva2/server/go/operators/mutation/MutateGAUniform.java b/src/eva2/server/go/operators/mutation/MutateGAUniform.java index fa29b689..c5159d94 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAUniform.java +++ b/src/eva2/server/go/operators/mutation/MutateGAUniform.java @@ -1,7 +1,5 @@ package eva2.server.go.operators.mutation; -import java.io.Serializable; - import eva2.gui.GenericObjectEditor; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceGAIndividual; @@ -9,6 +7,7 @@ import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; +import java.io.Serializable; /** * Uniform mutation mutates every GA bit with a fixed probability. diff --git a/src/eva2/server/go/operators/mutation/MutateGIInvert.java b/src/eva2/server/go/operators/mutation/MutateGIInvert.java index 3137d696..a4a7c328 100644 --- a/src/eva2/server/go/operators/mutation/MutateGIInvert.java +++ b/src/eva2/server/go/operators/mutation/MutateGIInvert.java @@ -93,7 +93,9 @@ public class MutateGIInvert implements InterfaceMutation, java.io.Serializable { private void pintInt(String s, int[] x) { String tmp = "{"+x[0]; - for (int i = 1; i < x.length; i++) tmp += ", "+x[i]; + for (int i = 1; i < x.length; i++) { + tmp += ", "+x[i]; + } System.out.println(s+tmp+"}"); } diff --git a/src/eva2/server/go/operators/mutation/MutateGIOrdinal.java b/src/eva2/server/go/operators/mutation/MutateGIOrdinal.java index 68674c72..1d0246a7 100644 --- a/src/eva2/server/go/operators/mutation/MutateGIOrdinal.java +++ b/src/eva2/server/go/operators/mutation/MutateGIOrdinal.java @@ -72,7 +72,7 @@ public class MutateGIOrdinal implements InterfaceMutation, java.io.Serializable for (int k = 0; k < this.m_NumberOfMutations; k++) { mutInd = RNG.randomInt(0, x.length-1); mutate = RNG.gaussianDouble(this.m_StepSize); - mutate = mutate * (range[mutInd][1] - range[mutInd][1]); + mutate *= (range[mutInd][1] - range[mutInd][1]); mut = (int)Math.round(mutate); if (mut == 0) { if (RNG.flipCoin(0.5)) mut = -1; diff --git a/src/eva2/server/go/operators/mutation/MutateGISubset.java b/src/eva2/server/go/operators/mutation/MutateGISubset.java index 00ce9187..d4f9220b 100644 --- a/src/eva2/server/go/operators/mutation/MutateGISubset.java +++ b/src/eva2/server/go/operators/mutation/MutateGISubset.java @@ -1,7 +1,5 @@ package eva2.server.go.operators.mutation; -import java.io.Serializable; - import eva2.gui.BeanInspector; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceGIIndividual; @@ -9,6 +7,7 @@ import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; +import java.io.Serializable; /** * An integer mutation operator which switches elements within a given subset only. diff --git a/src/eva2/server/go/operators/mutation/MutateGITranslocate.java b/src/eva2/server/go/operators/mutation/MutateGITranslocate.java index 66af6fb5..bb6abbf0 100644 --- a/src/eva2/server/go/operators/mutation/MutateGITranslocate.java +++ b/src/eva2/server/go/operators/mutation/MutateGITranslocate.java @@ -92,7 +92,9 @@ public class MutateGITranslocate implements InterfaceMutation, java.io.Serializa int[] tmp = new int[x.length]; int[] without = new int[x.length - length]; int[] insert = new int[length]; - for (int i = 0; i < length; i++) insert[i] = x[i+from]; + for (int i = 0; i < length; i++) { + insert[i] = x[i+from]; + } for (int i = 0; i < without.length; i++) { if (i < from) without[i] = x[i]; else without[i] = x[i+length]; diff --git a/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java b/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java index eb18727b..d6ef4052 100644 --- a/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java +++ b/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java @@ -72,7 +72,7 @@ public class MutateGPAdaptive implements InterfaceMutation, java.io.Serializable public void mutate(AbstractEAIndividual individual) { //System.out.println("Before Mutate: " +((GAIndividual)individual).getSolutionRepresentationFor()); if (individual instanceof InterfaceGPIndividual) { - this.m_MutationStep = this.m_MutationStep * Math.exp(this.m_Tau1 * RNG.gaussianDouble(1) + this.m_Tau2 * RNG.gaussianDouble(1)); + this.m_MutationStep *= Math.exp(this.m_Tau1 * RNG.gaussianDouble(1) + this.m_Tau2 * RNG.gaussianDouble(1)); if (this.m_MutationStep < this.m_LowerLimitStepSize) this.m_MutationStep = this.m_LowerLimitStepSize; if (this.m_MutationStep > 1) this.m_MutationStep = 1; if (RNG.flipCoin(this.m_MutationStep)) ((IndividualInterface)individual).defaultMutate(); diff --git a/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java b/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java index 2a251dfa..f4b03b0e 100644 --- a/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java +++ b/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java @@ -4,7 +4,6 @@ package eva2.server.go.operators.mutation; import java.util.ArrayList; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeProgram; import eva2.server.go.individuals.InterfaceGPIndividual; import eva2.server.go.individuals.codings.gp.AbstractGPNode; import eva2.server.go.individuals.codings.gp.GPArea; diff --git a/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java b/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java index 6c8c452b..cb35de42 100644 --- a/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java +++ b/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java @@ -1,7 +1,6 @@ package eva2.server.go.operators.mutation; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypePermutation; import eva2.server.go.individuals.InterfaceOBGAIndividual; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; diff --git a/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java b/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java index f8da0195..29488984 100644 --- a/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java +++ b/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java @@ -18,7 +18,9 @@ public class PropertyMutationMixer implements java.io.Serializable { public PropertyMutationMixer(InterfaceMutation[] d, boolean selectAllOrNone) { this.m_Weights = new double[d.length]; - for (int i = 0; i < d.length; i++) this.m_Weights[i] = 1/((double)d.length); + for (int i = 0; i < d.length; i++) { + this.m_Weights[i] = 1/((double)d.length); + } this.m_AvailableTargets = d; if (selectAllOrNone) this.m_SelectedTargets = d.clone(); else this.m_SelectedTargets = null; @@ -55,7 +57,9 @@ public class PropertyMutationMixer implements java.io.Serializable { if (this.m_Weights == null) { this.m_Weights = new double[d.length]; - for (int i = 0; i < this.m_Weights.length; i++) this.m_Weights[i] = 1/((double)d.length); + for (int i = 0; i < this.m_Weights.length; i++) { + this.m_Weights[i] = 1/((double)d.length); + } return; } @@ -63,11 +67,15 @@ public class PropertyMutationMixer implements java.io.Serializable { if (d.length > this.m_Weights.length) { double[] newWeights = new double[d.length]; - for (int i = 0; i < this.m_Weights.length; i++) newWeights[i] = this.m_Weights[i]; + for (int i = 0; i < this.m_Weights.length; i++) { + newWeights[i] = this.m_Weights[i]; + } this.m_Weights = newWeights; } else { double[] newWeights = new double[d.length]; - for (int i = 0; i < d.length; i++) newWeights[i] = this.m_Weights[i]; + for (int i = 0; i < d.length; i++) { + newWeights[i] = this.m_Weights[i]; + } this.m_Weights = newWeights; } } @@ -94,7 +102,9 @@ public class PropertyMutationMixer implements java.io.Serializable { } public void setWeights(double[] d) { this.m_Weights = d; - for (int i = 0; i < this.m_Weights.length; i++) this.m_Weights[i] = Math.abs(this.m_Weights[i]); + for (int i = 0; i < this.m_Weights.length; i++) { + this.m_Weights[i] = Math.abs(this.m_Weights[i]); + } } /** This method allows you to set/get the descriptive string @@ -124,7 +134,7 @@ public class PropertyMutationMixer implements java.io.Serializable { } if (sum > 0) { for (int i = 0; i < this.m_Weights.length; i++) { - this.m_Weights[i] = this.m_Weights[i]/sum; + this.m_Weights[i] /= sum; } } } diff --git a/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java b/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java index 4c1074db..ea510e93 100644 --- a/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java +++ b/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java @@ -1,19 +1,17 @@ package eva2.server.go.operators.mutation; -import javax.swing.*; - import eva2.gui.*; import eva2.server.go.tools.AbstractObjectEditor; import eva2.server.go.tools.GeneralGEOFaker; import eva2.server.go.tools.GeneralGOEProperty; import eva2.tools.BasicResourceLoader; - -import java.beans.*; import java.awt.*; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; -import java.awt.event.KeyListener; +import java.awt.event.ActionListener; import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.beans.*; +import javax.swing.*; /** * Created by IntelliJ IDEA. @@ -138,7 +136,9 @@ public class PropertyMutationMixerEditor extends JPanel implements PropertyEdito this.m_Targets = new JComponent[list.length]; this.m_Delete = new JButton[list.length]; String[] cups = new String[8]; - for (int i = 0; i < cups.length; i++) cups[i] = ""+(i+1); + for (int i = 0; i < cups.length; i++) { + cups[i] = ""+(i+1); + } // The head title gbc.anchor = GridBagConstraints.WEST; gbc.fill = GridBagConstraints.BOTH; diff --git a/src/eva2/server/go/operators/nichepso/deactivation/StandardDeactivationStrategy.java b/src/eva2/server/go/operators/nichepso/deactivation/StandardDeactivationStrategy.java index db9e770b..44ba5c7e 100644 --- a/src/eva2/server/go/operators/nichepso/deactivation/StandardDeactivationStrategy.java +++ b/src/eva2/server/go/operators/nichepso/deactivation/StandardDeactivationStrategy.java @@ -1,12 +1,11 @@ package eva2.server.go.operators.nichepso.deactivation; -import java.util.Vector; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; import eva2.server.go.strategies.NichePSO; import eva2.server.go.strategies.ParticleSubSwarmOptimization; import eva2.tools.EVAERROR; +import java.util.Vector; /** * A subswarm is deactivated if all its particles are converged. diff --git a/src/eva2/server/go/operators/nichepso/merging/InterfaceMergingStrategy.java b/src/eva2/server/go/operators/nichepso/merging/InterfaceMergingStrategy.java index cf15cd0b..8d3da3b2 100644 --- a/src/eva2/server/go/operators/nichepso/merging/InterfaceMergingStrategy.java +++ b/src/eva2/server/go/operators/nichepso/merging/InterfaceMergingStrategy.java @@ -1,8 +1,7 @@ package eva2.server.go.operators.nichepso.merging; -import java.util.Vector; - import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import java.util.Vector; /** diff --git a/src/eva2/server/go/operators/nichepso/merging/ScatterMergingStrategy.java b/src/eva2/server/go/operators/nichepso/merging/ScatterMergingStrategy.java index 6f60b71c..da243f70 100644 --- a/src/eva2/server/go/operators/nichepso/merging/ScatterMergingStrategy.java +++ b/src/eva2/server/go/operators/nichepso/merging/ScatterMergingStrategy.java @@ -1,8 +1,7 @@ package eva2.server.go.operators.nichepso.merging; -import java.util.Vector; - import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import java.util.Vector; /** diff --git a/src/eva2/server/go/operators/nichepso/merging/StandardMergingStrategy.java b/src/eva2/server/go/operators/nichepso/merging/StandardMergingStrategy.java index 2bd6cb53..224f2ca1 100644 --- a/src/eva2/server/go/operators/nichepso/merging/StandardMergingStrategy.java +++ b/src/eva2/server/go/operators/nichepso/merging/StandardMergingStrategy.java @@ -1,12 +1,11 @@ package eva2.server.go.operators.nichepso.merging; -import java.util.Vector; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceESIndividual; import eva2.server.go.operators.distancemetric.EuclideanMetric; import eva2.server.go.operators.distancemetric.PhenotypeMetric; import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import java.util.Vector; /** * Two subswarms are merged if their radii overlap. diff --git a/src/eva2/server/go/operators/paramcontrol/AbstractLinearParamAdaption.java b/src/eva2/server/go/operators/paramcontrol/AbstractLinearParamAdaption.java index b044296c..78a7e235 100644 --- a/src/eva2/server/go/operators/paramcontrol/AbstractLinearParamAdaption.java +++ b/src/eva2/server/go/operators/paramcontrol/AbstractLinearParamAdaption.java @@ -1,10 +1,9 @@ package eva2.server.go.operators.paramcontrol; -import java.io.Serializable; - import eva2.gui.BeanInspector; import eva2.server.go.populations.Population; import eva2.tools.math.Mathematics; +import java.io.Serializable; /** * Simple linear adaption of a String property. diff --git a/src/eva2/server/go/operators/paramcontrol/AbstractParameterControl.java b/src/eva2/server/go/operators/paramcontrol/AbstractParameterControl.java index 1b6a911f..9e32cc33 100644 --- a/src/eva2/server/go/operators/paramcontrol/AbstractParameterControl.java +++ b/src/eva2/server/go/operators/paramcontrol/AbstractParameterControl.java @@ -33,7 +33,9 @@ public abstract class AbstractParameterControl implements InterfaceParameterCont String[] params = getControlledParameters(); if (params != null) { initialValues=new Object[params.length]; - for (int i=0; i 0) { if (listener!=null) listener.print(" measures fit: "); int critCnt = extrOpts.getEAIndividual(0).getFitness().length; - for (int i=0; i1) { if (listener!=null) listener.print("; phen: " + BeanInspector.toString(extrOpts.getPopulationMeasures(new PhenotypeMetric()))); if (listener!=null) listener.print("; eucl: " + BeanInspector.toString(extrOpts.getPopulationMeasures(new EuclideanMetric()))); diff --git a/src/eva2/server/go/operators/postprocess/PostProcessParams.java b/src/eva2/server/go/operators/postprocess/PostProcessParams.java index 495652c6..6bb7e466 100644 --- a/src/eva2/server/go/operators/postprocess/PostProcessParams.java +++ b/src/eva2/server/go/operators/postprocess/PostProcessParams.java @@ -1,9 +1,8 @@ package eva2.server.go.operators.postprocess; -import java.io.Serializable; - import eva2.gui.GenericObjectEditor; import eva2.server.go.enums.PostProcessMethod; +import java.io.Serializable; public class PostProcessParams implements InterfacePostProcessParams, Serializable { diff --git a/src/eva2/server/go/operators/postprocess/SolutionHistogram.java b/src/eva2/server/go/operators/postprocess/SolutionHistogram.java index dcd8b959..36c6687c 100644 --- a/src/eva2/server/go/operators/postprocess/SolutionHistogram.java +++ b/src/eva2/server/go/operators/postprocess/SolutionHistogram.java @@ -1,12 +1,11 @@ package eva2.server.go.operators.postprocess; -import java.util.Arrays; - import eva2.gui.BeanInspector; import eva2.server.go.populations.Population; import eva2.server.go.problems.AbstractOptimizationProblem; import eva2.server.go.problems.InterfaceInterestingHistogram; import eva2.tools.math.Mathematics; +import java.util.Arrays; public class SolutionHistogram { private double lBound, uBound; @@ -73,7 +72,9 @@ public class SolutionHistogram { if (o.isEmtpy()) System.err.println("Warning, adding empty histogram... (SolutionHistogram)"); if (isCompatible(o)) { arity+=o.arity; - for (int i=0; i population.size()) throw new RuntimeException("Error, invalid selection: trying to select more individuals (without replacement) than available in SelectRandom."); int[] perm = RNG.randomPerm(size); - for (int i=0; i max) max = result[i]; @@ -106,7 +110,9 @@ public class SelProbStandardScaling extends AbstractSelProb implements java.io.S for (int x = 0; x < data[0].length; x++) { sum = 0; min = Double.POSITIVE_INFINITY; - for (int i = 0; i < data.length; i++) result[i] = -data[i][x]; + for (int i = 0; i < data.length; i++) { + result[i] = -data[i][x]; + } for (int i = 0; i < data.length; i++) { if (result[i] < min) min = result[i]; if (result[i] > max) max = result[i]; @@ -119,7 +125,9 @@ public class SelProbStandardScaling extends AbstractSelProb implements java.io.S sum += result[i]; } - for (int i = 0; i < population.size(); i++) ((AbstractEAIndividual)population.get(i)).SetSelectionProbability(x, result[i]/sum); + for (int i = 0; i < population.size(); i++) { + ((AbstractEAIndividual)population.get(i)).SetSelectionProbability(x, result[i]/sum); + } } } } diff --git a/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java b/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java index c94b84b8..f21bde90 100644 --- a/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java @@ -2,7 +2,6 @@ package eva2.server.go.operators.selection.replacement; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import eva2.tools.math.RNG; /** This method replaces the worst indvidual in the population. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java b/src/eva2/server/go/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java index 1e1b03c4..5ef040d9 100644 --- a/src/eva2/server/go/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java @@ -5,7 +5,6 @@ import java.util.Comparator; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.archiving.ArchivingNSGAII; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; import eva2.server.go.operators.selection.SelectRandom; import eva2.server.go.populations.Population; diff --git a/src/eva2/server/go/operators/terminators/CombinedTerminator.java b/src/eva2/server/go/operators/terminators/CombinedTerminator.java index bb5151fd..f590c6ef 100644 --- a/src/eva2/server/go/operators/terminators/CombinedTerminator.java +++ b/src/eva2/server/go/operators/terminators/CombinedTerminator.java @@ -1,12 +1,11 @@ package eva2.server.go.operators.terminators; -import java.io.Serializable; - import eva2.server.go.InterfaceTerminator; import eva2.server.go.PopulationInterface; import eva2.server.go.populations.InterfaceSolutionSet; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.SelectedTag; +import java.io.Serializable; public class CombinedTerminator implements InterfaceTerminator, Serializable { diff --git a/src/eva2/server/go/operators/terminators/EvaluationTerminator.java b/src/eva2/server/go/operators/terminators/EvaluationTerminator.java index 425544b9..ef93f9a6 100644 --- a/src/eva2/server/go/operators/terminators/EvaluationTerminator.java +++ b/src/eva2/server/go/operators/terminators/EvaluationTerminator.java @@ -12,12 +12,11 @@ package eva2.server.go.operators.terminators; /*==========================================================================* * IMPORTS *==========================================================================*/ -import java.io.Serializable; - 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; /*==========================================================================* * CLASS DECLARATION diff --git a/src/eva2/server/go/operators/terminators/FitnessConvergenceTerminator.java b/src/eva2/server/go/operators/terminators/FitnessConvergenceTerminator.java index 9237b100..82cbcdc4 100644 --- a/src/eva2/server/go/operators/terminators/FitnessConvergenceTerminator.java +++ b/src/eva2/server/go/operators/terminators/FitnessConvergenceTerminator.java @@ -1,10 +1,9 @@ package eva2.server.go.operators.terminators; -import java.io.Serializable; - import eva2.server.go.InterfaceTerminator; import eva2.server.go.PopulationInterface; import eva2.tools.math.Mathematics; +import java.io.Serializable; /** diff --git a/src/eva2/server/go/operators/terminators/FitnessValueTerminator.java b/src/eva2/server/go/operators/terminators/FitnessValueTerminator.java index f492dc49..a3d3720d 100644 --- a/src/eva2/server/go/operators/terminators/FitnessValueTerminator.java +++ b/src/eva2/server/go/operators/terminators/FitnessValueTerminator.java @@ -12,13 +12,12 @@ package eva2.server.go.operators.terminators; /*==========================================================================* * IMPORTS *==========================================================================*/ -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; /*==========================================================================* * CLASS DECLARATION diff --git a/src/eva2/server/go/operators/terminators/HistoryConvergenceTerminator.java b/src/eva2/server/go/operators/terminators/HistoryConvergenceTerminator.java index 3243e2c9..7d15a66e 100644 --- a/src/eva2/server/go/operators/terminators/HistoryConvergenceTerminator.java +++ b/src/eva2/server/go/operators/terminators/HistoryConvergenceTerminator.java @@ -1,8 +1,5 @@ package eva2.server.go.operators.terminators; -import java.io.Serializable; -import java.util.List; - import eva2.server.go.InterfaceTerminator; import eva2.server.go.PopulationInterface; import eva2.server.go.individuals.AbstractEAIndividual; @@ -11,6 +8,8 @@ import eva2.server.go.operators.distancemetric.ObjectiveSpaceMetric; import eva2.server.go.populations.InterfaceSolutionSet; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; +import java.io.Serializable; +import java.util.List; /** * A terminator regarding population history (the archive of a population). Since the population diff --git a/src/eva2/server/go/operators/terminators/KnownOptimaFoundTerminator.java b/src/eva2/server/go/operators/terminators/KnownOptimaFoundTerminator.java index d6e698c8..c772115b 100644 --- a/src/eva2/server/go/operators/terminators/KnownOptimaFoundTerminator.java +++ b/src/eva2/server/go/operators/terminators/KnownOptimaFoundTerminator.java @@ -1,7 +1,5 @@ package eva2.server.go.operators.terminators; -import java.io.Serializable; - import eva2.server.go.InterfaceTerminator; import eva2.server.go.PopulationInterface; import eva2.server.go.populations.InterfaceSolutionSet; @@ -9,6 +7,7 @@ import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceMultimodalProblemKnown; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; +import java.io.Serializable; /** * This terminator counts the number of found optima for a problem that diff --git a/src/eva2/server/go/operators/terminators/ParetoMetricTerminator.java b/src/eva2/server/go/operators/terminators/ParetoMetricTerminator.java index 12175ca4..ec5f634f 100644 --- a/src/eva2/server/go/operators/terminators/ParetoMetricTerminator.java +++ b/src/eva2/server/go/operators/terminators/ParetoMetricTerminator.java @@ -1,7 +1,5 @@ package eva2.server.go.operators.terminators; -import java.io.Serializable; - import eva2.gui.BeanInspector; import eva2.server.go.PopulationInterface; import eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric; @@ -10,6 +8,7 @@ import eva2.server.go.populations.Population; import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; +import java.io.Serializable; /** * Employ a pareto metric to determine convergence of a population. Requires to be run diff --git a/src/eva2/server/go/operators/terminators/PopulationMeasureTerminator.java b/src/eva2/server/go/operators/terminators/PopulationMeasureTerminator.java index 51ed237d..3f4fef1e 100644 --- a/src/eva2/server/go/operators/terminators/PopulationMeasureTerminator.java +++ b/src/eva2/server/go/operators/terminators/PopulationMeasureTerminator.java @@ -7,7 +7,6 @@ import eva2.server.go.InterfaceTerminator; import eva2.server.go.PopulationInterface; import eva2.server.go.populations.InterfaceSolutionSet; import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.tools.SelectedTag; /** * Abstract class giving the framework for a terminator that is based on diff --git a/src/eva2/server/go/populations/PBILPopulation.java b/src/eva2/server/go/populations/PBILPopulation.java index d480b5f8..b003d355 100644 --- a/src/eva2/server/go/populations/PBILPopulation.java +++ b/src/eva2/server/go/populations/PBILPopulation.java @@ -72,7 +72,7 @@ public class PBILPopulation extends Population implements Cloneable, java.io.Ser tmpIndy = (InterfaceGAIndividual)(examples.getEAIndividual(i)).clone(); tmpBitSet = tmpIndy.getBGenotype(); for (int j = 0; j < this.m_ProbabilityVector.length; j++) { - this.m_ProbabilityVector[j] = this.m_ProbabilityVector[j] * (1.0 - learnRate); + this.m_ProbabilityVector[j] *= (1.0 - learnRate); if (tmpBitSet.get(j)) this.m_ProbabilityVector[j] += learnRate; } } @@ -118,7 +118,9 @@ public class PBILPopulation extends Population implements Cloneable, java.io.Ser BitSet tmpSet; this.m_ProbabilityVector = new double[dim]; - for (int i = 0; i < this.m_ProbabilityVector.length; i++) this.m_ProbabilityVector[i] = 0; + for (int i = 0; i < this.m_ProbabilityVector.length; i++) { + this.m_ProbabilityVector[i] = 0; + } // first count the true bits for (int i = 0; i < this.size(); i++) { tmpSet = ((InterfaceGAIndividual)this.get(i)).getBGenotype(); @@ -128,7 +130,7 @@ public class PBILPopulation extends Population implements Cloneable, java.io.Ser } // now normalize for (int i = 0; i < dim; i++) { - this.m_ProbabilityVector[i] = this.m_ProbabilityVector[i]/this.size(); + this.m_ProbabilityVector[i] /= this.size(); } } diff --git a/src/eva2/server/go/populations/Population.java b/src/eva2/server/go/populations/Population.java index 47260b41..1f094444 100644 --- a/src/eva2/server/go/populations/Population.java +++ b/src/eva2/server/go/populations/Population.java @@ -643,7 +643,7 @@ public class Population extends ArrayList implements PopulationInterface, Clonea int toHit = (nextStep - functionCallCount); this.functionCallCount += toHit; // little cheat, notify may be after some more evals firePropertyChangedEvent(funCallIntervalReached); - d = d - toHit; + d -= toHit; // this.m_FunctionCalls += (d-toHit); } if (d > 0) { @@ -1865,7 +1865,7 @@ public class Population extends ArrayList implements PopulationInterface, Clonea } } for (int j = 0; j < result.length; j++) { - result[j] = result[j] / ((double) this.size()); + result[j] /= ((double) this.size()); } return result; } @@ -2075,7 +2075,7 @@ public class Population extends ArrayList implements PopulationInterface, Clonea res[0] = res[1] = res[2] = res[3] = Double.NaN; } else { // calc standard deviation - res[0] = res[0] / pop.size(); + res[0] /= pop.size(); for (int i = 0; i < pop.size(); i++) { d = res[0] - pop.get(i).getFitness(fitCrit); res[3] += d * d; diff --git a/src/eva2/server/go/problems/AbstractDynTransProblem.java b/src/eva2/server/go/problems/AbstractDynTransProblem.java index bdb7f762..57accb16 100644 --- a/src/eva2/server/go/problems/AbstractDynTransProblem.java +++ b/src/eva2/server/go/problems/AbstractDynTransProblem.java @@ -1,11 +1,10 @@ package eva2.server.go.problems; -import java.util.Random; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.server.go.populations.Population; import eva2.server.go.strategies.InterfaceOptimizer; +import java.util.Random; public abstract class AbstractDynTransProblem extends AbstractSynchronousOptimizationProblem { @@ -80,8 +79,9 @@ public abstract class AbstractDynTransProblem extends AbstractSynchronousOptimiz private double transLength(double time) { double ret = 0.; - for (int i = 0; i < getProblemDimension(); i++) - ret += Math.pow(getTranslation(i, time), 2.); + for (int i = 0; i < getProblemDimension(); i++) { + ret += Math.pow(getTranslation(i, time), 2.); + } return Math.sqrt(ret); } @@ -133,8 +133,9 @@ public abstract class AbstractDynTransProblem extends AbstractSynchronousOptimiz public void initPopulationAt(Population population, double time) { if (TRACE) System.out.println("DynTransProblem at " + this + " initPop, problem is " + getProblem()); getProblem().initPopulation(population); - for (int i = 0; i < population.size(); i++) - ((AbstractEAIndividual)population.get(i)).SetAge(0); + for (int i = 0; i < population.size(); i++) { + ((AbstractEAIndividual)population.get(i)).SetAge(0); + } } public int getProblemDimension() { diff --git a/src/eva2/server/go/problems/AbstractMultiModalProblemKnown.java b/src/eva2/server/go/problems/AbstractMultiModalProblemKnown.java index 6c9553a5..35b51a01 100644 --- a/src/eva2/server/go/problems/AbstractMultiModalProblemKnown.java +++ b/src/eva2/server/go/problems/AbstractMultiModalProblemKnown.java @@ -1,7 +1,5 @@ package eva2.server.go.problems; -import java.util.List; - import eva2.server.go.PopulationInterface; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.ESIndividualDoubleData; @@ -13,6 +11,7 @@ import eva2.server.go.populations.Population; import eva2.tools.EVAERROR; import eva2.tools.ToolBox; import eva2.tools.math.Mathematics; +import java.util.List; public abstract class AbstractMultiModalProblemKnown extends AbstractProblemDouble implements Interface2DBorderProblem, InterfaceMultimodalProblemKnown { diff --git a/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java b/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java index ce31e60c..d8218b54 100644 --- a/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java +++ b/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java @@ -1,12 +1,5 @@ package eva2.server.go.problems; -import java.awt.Color; -import java.util.ArrayList; -import java.util.Vector; -import java.util.concurrent.Semaphore; - -import javax.swing.JFrame; - import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.server.go.PopulationInterface; @@ -24,6 +17,11 @@ import eva2.tools.ToolBox; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; +import java.awt.Color; +import java.util.ArrayList; +import java.util.Vector; +import java.util.concurrent.Semaphore; +import javax.swing.JFrame; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/AbstractOptimizationProblem.java b/src/eva2/server/go/problems/AbstractOptimizationProblem.java index efa80be2..ccd5b3af 100644 --- a/src/eva2/server/go/problems/AbstractOptimizationProblem.java +++ b/src/eva2/server/go/problems/AbstractOptimizationProblem.java @@ -1,17 +1,5 @@ package eva2.server.go.problems; -import java.awt.BorderLayout; -import java.io.Serializable; -import java.util.Vector; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Semaphore; - -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; - import eva2.server.go.InterfaceTerminator; import eva2.server.go.PopulationInterface; import eva2.server.go.enums.PostProcessMethod; @@ -36,6 +24,16 @@ import eva2.server.go.operators.terminators.PopulationMeasureTerminator.Stagnati import eva2.server.go.populations.Population; import eva2.server.go.strategies.InterfaceOptimizer; import eva2.tools.ToolBox; +import java.awt.BorderLayout; +import java.io.Serializable; +import java.util.Vector; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Semaphore; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/AbstractProblemBinary.java b/src/eva2/server/go/problems/AbstractProblemBinary.java index 89205f70..db7c7a1a 100644 --- a/src/eva2/server/go/problems/AbstractProblemBinary.java +++ b/src/eva2/server/go/problems/AbstractProblemBinary.java @@ -1,13 +1,12 @@ package eva2.server.go.problems; -import java.util.BitSet; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.GAIndividualBinaryData; import eva2.server.go.individuals.InterfaceDataTypeBinary; import eva2.server.go.individuals.InterfaceGAIndividual; import eva2.server.go.populations.Population; import eva2.server.go.strategies.InterfaceOptimizer; +import java.util.BitSet; /** * An abstract problem based on binary data. diff --git a/src/eva2/server/go/problems/AbstractProblemDouble.java b/src/eva2/server/go/problems/AbstractProblemDouble.java index a0522c33..f0a443b6 100644 --- a/src/eva2/server/go/problems/AbstractProblemDouble.java +++ b/src/eva2/server/go/problems/AbstractProblemDouble.java @@ -19,9 +19,9 @@ import eva2.server.go.strategies.InterfaceOptimizer; import eva2.tools.Pair; import eva2.tools.ToolBox; import eva2.tools.diagram.ColorBarCalculator; +import eva2.tools.math.Jama.Matrix; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; -import eva2.tools.math.Jama.Matrix; /** * For a double valued problem, there are two main methods to implement: @@ -103,9 +103,10 @@ public abstract class AbstractProblemDouble extends AbstractOptimizationProblem this.m_Template = (AbstractEAIndividual) o.m_Template.clone(); if (o.constraintArray != null) { this.constraintArray = o.constraintArray.clone(); - for (int i = 0; i < constraintArray.length; i++) - constraintArray[i] = (AbstractConstraint) o.constraintArray[i] - .clone(); + for (int i = 0; i < constraintArray.length; i++) { + constraintArray[i] = (AbstractConstraint) o.constraintArray[i] + .clone(); + } } this.withConstraints = o.withConstraints; this.doRotation = o.doRotation; diff --git a/src/eva2/server/go/problems/B1Problem.java b/src/eva2/server/go/problems/B1Problem.java index eb2fa806..6dadd118 100644 --- a/src/eva2/server/go/problems/B1Problem.java +++ b/src/eva2/server/go/problems/B1Problem.java @@ -1,14 +1,13 @@ package eva2.server.go.problems; -import java.util.BitSet; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceDataTypeBinary; import eva2.server.go.operators.mutation.MutateEAMixer; import eva2.server.go.operators.mutation.MutateGAGISwapBits; import eva2.server.go.operators.mutation.MutateGAUniform; import eva2.server.go.strategies.InterfaceOptimizer; +import java.util.BitSet; /** * The minimize bits problem for binary optimization. @@ -51,7 +50,9 @@ public class B1Problem extends AbstractProblemBinary implements java.io.Serializ double[] result = new double[1]; int fitness = 0; - for (int i = 0; i < getProblemDimension(); i++) if (b.get(i)) fitness++; + for (int i = 0; i < getProblemDimension(); i++) { + if (b.get(i)) fitness++; + } result[0] = fitness; return result; } diff --git a/src/eva2/server/go/problems/BKnapsackProblem.java b/src/eva2/server/go/problems/BKnapsackProblem.java index b0da4914..a9309d7e 100644 --- a/src/eva2/server/go/problems/BKnapsackProblem.java +++ b/src/eva2/server/go/problems/BKnapsackProblem.java @@ -2,13 +2,11 @@ package eva2.server.go.problems; -import java.util.BitSet; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceDataTypeBinary; import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.problems.AbstractProblemBinary; import eva2.tools.math.RNG; +import java.util.BitSet; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/ConstrHimmelblauProblem.java b/src/eva2/server/go/problems/ConstrHimmelblauProblem.java index c1bc13df..bff7a041 100644 --- a/src/eva2/server/go/problems/ConstrHimmelblauProblem.java +++ b/src/eva2/server/go/problems/ConstrHimmelblauProblem.java @@ -1,11 +1,10 @@ package eva2.server.go.problems; -import java.io.Serializable; -import java.util.Vector; - import eva2.server.go.operators.constraint.AbstractConstraint; import eva2.server.go.operators.constraint.ConstraintCollection; import eva2.server.go.operators.constraint.IntervalConstraint; +import java.io.Serializable; +import java.util.Vector; public class ConstrHimmelblauProblem extends AbstractProblemDouble implements Serializable { private static double yOffset = 31025.5602425; // moving the optimum close to zero diff --git a/src/eva2/server/go/problems/ConstrPressureVessel.java b/src/eva2/server/go/problems/ConstrPressureVessel.java index d38c1c41..1f11e479 100644 --- a/src/eva2/server/go/problems/ConstrPressureVessel.java +++ b/src/eva2/server/go/problems/ConstrPressureVessel.java @@ -1,6 +1,5 @@ package eva2.server.go.problems; -import java.util.Iterator; import java.util.Vector; import eva2.gui.GenericObjectEditor; diff --git a/src/eva2/server/go/problems/DynJumpProblem.java b/src/eva2/server/go/problems/DynJumpProblem.java index c033a09e..c27789bd 100644 --- a/src/eva2/server/go/problems/DynJumpProblem.java +++ b/src/eva2/server/go/problems/DynJumpProblem.java @@ -1,11 +1,10 @@ package eva2.server.go.problems; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.strategies.InterfaceOptimizer; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; /** * A dynamically "jumping" problem. The severity gives the length of one jump in problem space, occurring @@ -111,8 +110,9 @@ public class DynJumpProblem extends AbstractDynTransProblem { } if (TRACE) { System.out.print("Jumped to "); - for (int i = 0; i < getProblemDimension(); i++) - System.out.print(" " + translation[i]); + for (int i = 0; i < getProblemDimension(); i++) { + System.out.print(" " + translation[i]); + } System.out.println(); } } diff --git a/src/eva2/server/go/problems/ERPStarter.java b/src/eva2/server/go/problems/ERPStarter.java index 1cae393a..b3efd7ed 100644 --- a/src/eva2/server/go/problems/ERPStarter.java +++ b/src/eva2/server/go/problems/ERPStarter.java @@ -47,7 +47,9 @@ public class ERPStarter { if (unknownArgs.length>0 || (values[2]==null) || (values[3]==null) || (values[4]==null)) { System.err.println("Missing or unrecognized command line options: "); - for (int i=0; i --cmd --maxEvals [--multiObjective] [--gui]"); return; } diff --git a/src/eva2/server/go/problems/ExternalRuntimeProblem.java b/src/eva2/server/go/problems/ExternalRuntimeProblem.java index a01ea464..3db316c3 100644 --- a/src/eva2/server/go/problems/ExternalRuntimeProblem.java +++ b/src/eva2/server/go/problems/ExternalRuntimeProblem.java @@ -1,17 +1,5 @@ package eva2.server.go.problems; -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.Reader; -import java.io.Writer; -import java.util.ArrayList; -import java.util.List; - import eva2.gui.BeanInspector; import eva2.gui.PropertyDoubleArray; import eva2.server.go.individuals.AbstractEAIndividual; @@ -22,6 +10,17 @@ import eva2.server.go.operators.moso.MOSONoConvert; import eva2.server.go.populations.Population; import eva2.server.go.strategies.InterfaceOptimizer; import eva2.tools.math.Mathematics; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.Writer; +import java.util.ArrayList; +import java.util.List; public class ExternalRuntimeProblem extends AbstractOptimizationProblem implements Interface2DBorderProblem, InterfaceProblemDouble, InterfaceHasInitRange { diff --git a/src/eva2/server/go/problems/F15Problem.java b/src/eva2/server/go/problems/F15Problem.java index 2eb3acf8..8cc18403 100644 --- a/src/eva2/server/go/problems/F15Problem.java +++ b/src/eva2/server/go/problems/F15Problem.java @@ -1,8 +1,7 @@ package eva2.server.go.problems; -import java.io.Serializable; - import eva2.server.go.operators.postprocess.SolutionHistogram; +import java.io.Serializable; /** * The Levy-function, from Levy, A., and Montalvo, A. (1985). Also described in diff --git a/src/eva2/server/go/problems/F19Problem.java b/src/eva2/server/go/problems/F19Problem.java index 8c6ae444..09475644 100644 --- a/src/eva2/server/go/problems/F19Problem.java +++ b/src/eva2/server/go/problems/F19Problem.java @@ -1,10 +1,9 @@ package eva2.server.go.problems; -import java.util.Arrays; -import java.util.Random; - import eva2.server.go.operators.postprocess.SolutionHistogram; import eva2.tools.math.RNG; +import java.util.Arrays; +import java.util.Random; /** * Fletcher-Powell function with up to 2^n optima from Shir&Baeck, PPSN 2006, diff --git a/src/eva2/server/go/problems/F20Problem.java b/src/eva2/server/go/problems/F20Problem.java index 57fc7a36..1be4550c 100644 --- a/src/eva2/server/go/problems/F20Problem.java +++ b/src/eva2/server/go/problems/F20Problem.java @@ -1,8 +1,7 @@ package eva2.server.go.problems; -import java.io.Serializable; - import eva2.server.go.operators.postprocess.SolutionHistogram; +import java.io.Serializable; /** * The multi-modal, multi-funnel Rana function, f_rana = sum_{i=0}^{n-2} (g(x_i, x_{i+1}) diff --git a/src/eva2/server/go/problems/F8Problem.java b/src/eva2/server/go/problems/F8Problem.java index 2b621f51..ff882d3f 100644 --- a/src/eva2/server/go/problems/F8Problem.java +++ b/src/eva2/server/go/problems/F8Problem.java @@ -1,7 +1,5 @@ package eva2.server.go.problems; -import java.util.Arrays; - import eva2.server.go.PopulationInterface; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.distancemetric.EuclideanMetric; @@ -9,6 +7,7 @@ import eva2.server.go.operators.postprocess.SolutionHistogram; import eva2.server.go.populations.Population; import eva2.tools.ToolBox; import eva2.tools.math.Mathematics; +import java.util.Arrays; /** diff --git a/src/eva2/server/go/problems/FLensProblem.java b/src/eva2/server/go/problems/FLensProblem.java index 47d9fbd6..761ae917 100644 --- a/src/eva2/server/go/problems/FLensProblem.java +++ b/src/eva2/server/go/problems/FLensProblem.java @@ -19,7 +19,6 @@ import javax.swing.JScrollPane; import javax.swing.JTextArea; import eva2.server.go.GOStandaloneVersion; -import eva2.server.go.PopulationInterface; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.ESIndividualDoubleData; import eva2.server.go.individuals.InterfaceDataTypeDouble; @@ -325,7 +324,9 @@ implements InterfaceOptimizationProblem, InterfaceHasSolutionViewer, java.io.Ser x = new double[((InterfaceDataTypeDouble) individual).getDoubleData().length]; System.arraycopy(((InterfaceDataTypeDouble) individual).getDoubleData(), 0, x, 0, x.length); - for (int i = 0; i < x.length; i++) x[i] = x[i] - this.m_XOffSet; + for (int i = 0; i < x.length; i++) { + x[i] -= this.m_XOffSet; + } fitness = this.doEvaluation(x); for (int i = 0; i < fitness.length; i++) { // add noise to the fitness @@ -348,10 +349,14 @@ implements InterfaceOptimizationProblem, InterfaceHasSolutionViewer, java.io.Ser double[] ret = new double[1]; // set a minimum value for the thickness of the lens - for (int i = 0; i < x.length; i++) if (x[i] < 0.1) x[i] = 0.1; + for (int i = 0; i < x.length; i++) { + if (x[i] < 0.1) x[i] = 0.1; + } double[] tmpFit = this.testLens(x); - for (int i = 0; i < tmpFit.length; i++) fitness += Math.pow(tmpFit[i], 2); + for (int i = 0; i < tmpFit.length; i++) { + fitness += Math.pow(tmpFit[i], 2); + } // // Computation of fitness. Uses an approximation for very thin lenses. // // The fitness is the sum over all segments of the deviation from the center @@ -361,7 +366,7 @@ implements InterfaceOptimizationProblem, InterfaceHasSolutionViewer, java.io.Ser // Here the thickness of the middle segment of the lens is added to the fitness // to permit the optimization to reduce the overall thickness of the lens - if (this.m_UseMaterialConst) fitness = fitness + x[(int)(x.length/2)]; + if (this.m_UseMaterialConst) fitness += x[(int)(x.length/2)]; ret[0] = fitness; return ret; @@ -377,8 +382,9 @@ implements InterfaceOptimizationProblem, InterfaceHasSolutionViewer, java.io.Ser // Computation of fitness. Uses an approximation for very thin lenses. // The fitness is the sum over all segments of the deviation from the center // of focus of a beam running through a segment. - for (int i = 1; i < x.length; i++) - result[i-1] = m_Radius - m_SegmentHight / 2 - m_SegmentHight * (i - 1) - m_FocalLength / m_SegmentHight * (m_Epsilon - 1) * (x[i] - x[i-1]); + for (int i = 1; i < x.length; i++) { + result[i-1] = m_Radius - m_SegmentHight / 2 - m_SegmentHight * (i - 1) - m_FocalLength / m_SegmentHight * (m_Epsilon - 1) * (x[i] - x[i-1]); + } return result; } diff --git a/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java b/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java index 6159c839..8d57fa1d 100644 --- a/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java +++ b/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java @@ -2,7 +2,6 @@ package eva2.server.go.problems; import eva2.server.go.problems.InterfaceOptimizationObjective; -import javax.swing.*; import eva2.server.go.mocco.paretofrontviewer.InterfaceParetoFrontView; import eva2.server.go.mocco.paretofrontviewer.MOCCOViewer; diff --git a/src/eva2/server/go/problems/InterfaceOptimizationProblem.java b/src/eva2/server/go/problems/InterfaceOptimizationProblem.java index 3cee54ed..17404939 100644 --- a/src/eva2/server/go/problems/InterfaceOptimizationProblem.java +++ b/src/eva2/server/go/problems/InterfaceOptimizationProblem.java @@ -1,10 +1,9 @@ package eva2.server.go.problems; -import javax.swing.*; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; import eva2.server.go.strategies.InterfaceOptimizer; +import javax.swing.*; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/MatlabEvalMediator.java b/src/eva2/server/go/problems/MatlabEvalMediator.java index 69525d0c..4c755d52 100644 --- a/src/eva2/server/go/problems/MatlabEvalMediator.java +++ b/src/eva2/server/go/problems/MatlabEvalMediator.java @@ -1,10 +1,9 @@ package eva2.server.go.problems; +import eva2.gui.BeanInspector; import java.util.BitSet; import java.util.concurrent.Semaphore; -import eva2.gui.BeanInspector; - /** * This implements a thread acting as a mediator between EvA and Matlab. Thanks to the idea * of Henning Schmidt! diff --git a/src/eva2/server/go/problems/MatlabProblem.java b/src/eva2/server/go/problems/MatlabProblem.java index a841739b..c357dc26 100644 --- a/src/eva2/server/go/problems/MatlabProblem.java +++ b/src/eva2/server/go/problems/MatlabProblem.java @@ -200,14 +200,18 @@ public class MatlabProblem extends AbstractOptimizationProblem implements Interf if (globalRange!=null) { // these may be Matlab objects, so I do it by foot, just to be sure not to clone them within Matlab instead of here this.range = new double[globalRange.length][globalRange[0].length]; for (int i=0; i simProb = new SimpleF1(); diff --git a/src/eva2/server/go/problems/TF1Problem.java b/src/eva2/server/go/problems/TF1Problem.java index a38b43b8..7d8b884b 100644 --- a/src/eva2/server/go/problems/TF1Problem.java +++ b/src/eva2/server/go/problems/TF1Problem.java @@ -118,7 +118,9 @@ public class TF1Problem extends AbstractMultiObjectiveOptimizationProblem implem x = new double[((InterfaceDataTypeDouble) individual).getDoubleData().length]; System.arraycopy(((InterfaceDataTypeDouble) individual).getDoubleData(), 0, x, 0, x.length); - for (int i = 0; i < x.length; i++) x[i] = x[i] - this.m_XOffSet; + for (int i = 0; i < x.length; i++) { + x[i] -= this.m_XOffSet; + } fitness = this.doEvaluation(x); for (int i = 0; i < fitness.length; i++) { // add noise to the fitness @@ -158,7 +160,9 @@ public class TF1Problem extends AbstractMultiObjectiveOptimizationProblem implem protected double g(double[] x) { double result = 0; - for (int i = 1; i < x.length; i++) result += x[i]; + for (int i = 1; i < x.length; i++) { + result += x[i]; + } result = result * 9/(x.length-1); result += 1; return result; diff --git a/src/eva2/server/go/problems/WaitForEvARunnable.java b/src/eva2/server/go/problems/WaitForEvARunnable.java index 085b9281..084604db 100644 --- a/src/eva2/server/go/problems/WaitForEvARunnable.java +++ b/src/eva2/server/go/problems/WaitForEvARunnable.java @@ -1,11 +1,10 @@ package eva2.server.go.problems; -import java.io.PrintWriter; -import java.io.StringWriter; - import eva2.OptimizerRunnable; import eva2.gui.BeanInspector; import eva2.server.go.individuals.AbstractEAIndividual; +import java.io.PrintWriter; +import java.io.StringWriter; class WaitForEvARunnable implements Runnable { OptimizerRunnable runnable; diff --git a/src/eva2/server/go/problems/inference/metabolic/TimeSeries.java b/src/eva2/server/go/problems/inference/metabolic/TimeSeries.java index 02731372..f33f4182 100755 --- a/src/eva2/server/go/problems/inference/metabolic/TimeSeries.java +++ b/src/eva2/server/go/problems/inference/metabolic/TimeSeries.java @@ -138,10 +138,11 @@ public class TimeSeries implements Serializable { i = 0; j = ((Integer) names.get(name)).intValue(); - for (i = 0; i < data.length; i++) - if (!data[i][j].equals("-1") - && !data[i][j].equals("NaN")) - count++; + for (i = 0; i < data.length; i++) { + if (!data[i][j].equals("-1") + && !data[i][j].equals("NaN")) + count++; + } values = new double[2][count]; // /* // * The times are supposed to be the first column. However, @@ -152,13 +153,14 @@ public class TimeSeries implements Serializable { // tcol = ((Integer) this.names.get("Time")).intValue(); // } catch (Exception exc) { // }; - for (i = 0, count = 0; i < data.length; i++) - if (!data[i][j].equals("-1") - && !data[i][j].equals("NaN")) { - values[0][count] = Double - .parseDouble(data[i][tcol]); - values[1][count++] = Double.parseDouble(data[i][j]); - } + for (i = 0, count = 0; i < data.length; i++) { + if (!data[i][j].equals("-1") + && !data[i][j].equals("NaN")) { + values[0][count] = Double + .parseDouble(data[i][tcol]); + values[1][count++] = Double.parseDouble(data[i][j]); + } + } names.put(name, values); } catch (Exception exc) { exc.printStackTrace(); diff --git a/src/eva2/server/go/problems/regression/RFKoza_GPI_10_1.java b/src/eva2/server/go/problems/regression/RFKoza_GPI_10_1.java index 357dd5d4..f95bd74c 100644 --- a/src/eva2/server/go/problems/regression/RFKoza_GPI_10_1.java +++ b/src/eva2/server/go/problems/regression/RFKoza_GPI_10_1.java @@ -29,7 +29,9 @@ public class RFKoza_GPI_10_1 implements InterfaceRegressionFunction, java.io.Ser @Override public double evaluateFunction(double[] x) { double result = 0; - for (int i = 0; i < x.length; i++) result += Math.cos(2*x[i]); + for (int i = 0; i < x.length; i++) { + result += Math.cos(2*x[i]); + } return result; } diff --git a/src/eva2/server/go/problems/regression/RFKoza_GPI_10_2.java b/src/eva2/server/go/problems/regression/RFKoza_GPI_10_2.java index 05270c68..ef448e0f 100644 --- a/src/eva2/server/go/problems/regression/RFKoza_GPI_10_2.java +++ b/src/eva2/server/go/problems/regression/RFKoza_GPI_10_2.java @@ -29,7 +29,9 @@ public class RFKoza_GPI_10_2 implements InterfaceRegressionFunction, java.io.Ser @Override public double evaluateFunction(double[] x) { double result = 0; - for (int i = 0; i < x.length; i++) result += 3.1416*x[i] + 2.718 * Math.pow(x[i], 2); + for (int i = 0; i < x.length; i++) { + result += 3.1416*x[i] + 2.718 * Math.pow(x[i], 2); + } return result; } diff --git a/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3_extended.java b/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3_extended.java index 06495f43..d86c5e69 100644 --- a/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3_extended.java +++ b/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3_extended.java @@ -29,7 +29,9 @@ public class RFKoza_GPI_7_3_extended implements InterfaceRegressionFunction, jav @Override public double evaluateFunction(double[] x) { double result = 0; - for (int i = 0; i < x.length; i++) result += 0.12345*Math.pow(x[i], 4) + (Math.PI/4)*Math.pow(x[i], 3) + (Math.E/2)*Math.pow(x[i], 2) + 1.23456*Math.pow(x[i], 1); + for (int i = 0; i < x.length; i++) { + result += 0.12345*Math.pow(x[i], 4) + (Math.PI/4)*Math.pow(x[i], 3) + (Math.E/2)*Math.pow(x[i], 2) + 1.23456*Math.pow(x[i], 1); + } return result; } diff --git a/src/eva2/server/go/problems/regression/RFRaidl_F1.java b/src/eva2/server/go/problems/regression/RFRaidl_F1.java index 3d269d3e..207ea992 100644 --- a/src/eva2/server/go/problems/regression/RFRaidl_F1.java +++ b/src/eva2/server/go/problems/regression/RFRaidl_F1.java @@ -29,7 +29,9 @@ public class RFRaidl_F1 implements InterfaceRegressionFunction, java.io.Serializ @Override public double evaluateFunction(double[] x) { double result = 0; - for (int i = 0; i < x.length; i++) result += Math.sin(x[i]); + for (int i = 0; i < x.length; i++) { + result += Math.sin(x[i]); + } return result; } diff --git a/src/eva2/server/go/problems/regression/RFRaidl_F2.java b/src/eva2/server/go/problems/regression/RFRaidl_F2.java index d76b9be9..d2df82a0 100644 --- a/src/eva2/server/go/problems/regression/RFRaidl_F2.java +++ b/src/eva2/server/go/problems/regression/RFRaidl_F2.java @@ -29,7 +29,9 @@ public class RFRaidl_F2 implements InterfaceRegressionFunction, java.io.Serializ @Override public double evaluateFunction(double[] x) { double result = 0; - for (int i = 0; i < x.length; i++) result += Math.exp(x[i]/3)*Math.cos(3*x[i])/2; + for (int i = 0; i < x.length; i++) { + result += Math.exp(x[i]/3)*Math.cos(3*x[i])/2; + } return result; } diff --git a/src/eva2/server/go/problems/regression/RFRaidl_F3.java b/src/eva2/server/go/problems/regression/RFRaidl_F3.java index 069ed35c..985b7d3d 100644 --- a/src/eva2/server/go/problems/regression/RFRaidl_F3.java +++ b/src/eva2/server/go/problems/regression/RFRaidl_F3.java @@ -29,7 +29,9 @@ public class RFRaidl_F3 implements InterfaceRegressionFunction, java.io.Serializ @Override public double evaluateFunction(double[] x) { double result = 0; - for (int i = 0; i < x.length; i++) result += Math.log(4+2*Math.sin(x[i]*Math.sin(8*x[i])))*Math.exp(Math.cos(3*x[i])); + for (int i = 0; i < x.length; i++) { + result += Math.log(4+2*Math.sin(x[i]*Math.sin(8*x[i])))*Math.exp(Math.cos(3*x[i])); + } return result; } diff --git a/src/eva2/server/go/strategies/ANPSO.java b/src/eva2/server/go/strategies/ANPSO.java index 03c9a383..29bf64f1 100644 --- a/src/eva2/server/go/strategies/ANPSO.java +++ b/src/eva2/server/go/strategies/ANPSO.java @@ -414,7 +414,9 @@ public class ANPSO extends NichePSO implements InterfaceOptimizer, InterfaceAddi if (pop.size() 0) { if (m_Undifferentiated.getGeneration()<=1) plot(m_Undifferentiated.getGeneration()); @@ -1422,7 +1423,7 @@ public class ClusterBasedNichingEA implements InterfacePopulationChangedEventLis double[][] range = ((InterfaceProblemDouble)m_Problem).makeRange(); int dim = range.length; double nRad = EsDpiNiching.calcEstimatedNicheRadius(range, numExpectedOptima, ((ClusteringDensityBased) m_CAForSpeciesDifferentation).getMetric()); - nRad = nRad * Math.pow(0.5, 1/dim); + nRad *= Math.pow(0.5, 1/dim); // System.out.println("Alternative clust diff from niche radius... " + nRad); this.clusterDiffDist = nRad; // System.out.println("Setting the clusterDiffDist to "+ clusterDiffDist); diff --git a/src/eva2/server/go/strategies/ClusteringHillClimbing.java b/src/eva2/server/go/strategies/ClusteringHillClimbing.java index 31c43cdd..80fd0560 100644 --- a/src/eva2/server/go/strategies/ClusteringHillClimbing.java +++ b/src/eva2/server/go/strategies/ClusteringHillClimbing.java @@ -1,7 +1,5 @@ package eva2.server.go.strategies; -import java.io.Serializable; - import eva2.gui.GenericObjectEditor; import eva2.server.go.InterfacePopulationChangedEventListener; import eva2.server.go.PopulationInterface; @@ -16,6 +14,7 @@ import eva2.server.go.problems.F1Problem; import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; +import java.io.Serializable; /** diff --git a/src/eva2/server/go/strategies/DifferentialEvolution.java b/src/eva2/server/go/strategies/DifferentialEvolution.java index 8ed0f04f..96b45ac1 100644 --- a/src/eva2/server/go/strategies/DifferentialEvolution.java +++ b/src/eva2/server/go/strategies/DifferentialEvolution.java @@ -1,7 +1,5 @@ package eva2.server.go.strategies; -import java.util.Vector; - import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; import eva2.server.go.InterfacePopulationChangedEventListener; @@ -20,6 +18,7 @@ import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; +import java.util.Vector; /** * Differential evolution implementing DE1 and DE2 following the paper of Storm and diff --git a/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java b/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java index 815ca2df..90e4f24e 100644 --- a/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java +++ b/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java @@ -4,7 +4,6 @@ import eva2.gui.GenericObjectEditor; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.individuals.InterfaceESIndividual; import eva2.server.go.populations.Population; import eva2.server.go.problems.AbstractOptimizationProblem; import eva2.server.go.problems.InterfaceOptimizationProblem; diff --git a/src/eva2/server/go/strategies/EsDpiNiching.java b/src/eva2/server/go/strategies/EsDpiNiching.java index 7e7f9271..778dcbd1 100644 --- a/src/eva2/server/go/strategies/EsDpiNiching.java +++ b/src/eva2/server/go/strategies/EsDpiNiching.java @@ -1,9 +1,5 @@ package eva2.server.go.strategies; -import java.io.Serializable; -import java.util.Arrays; -import java.util.Formatter; - import eva2.gui.GenericObjectEditor; import eva2.gui.TopoPlot; import eva2.server.go.InterfacePopulationChangedEventListener; @@ -32,6 +28,9 @@ import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; +import java.io.Serializable; +import java.util.Arrays; +import java.util.Formatter; /** * The ES niching with dynamic peak identification. Basically, for a set of diff --git a/src/eva2/server/go/strategies/EvolutionStrategyIPOP.java b/src/eva2/server/go/strategies/EvolutionStrategyIPOP.java index a9bf9c01..07614f96 100644 --- a/src/eva2/server/go/strategies/EvolutionStrategyIPOP.java +++ b/src/eva2/server/go/strategies/EvolutionStrategyIPOP.java @@ -1,8 +1,5 @@ package eva2.server.go.strategies; -import java.util.Arrays; -import java.util.LinkedList; - import eva2.gui.GenericObjectEditor; import eva2.server.go.InterfacePopulationChangedEventListener; import eva2.server.go.InterfaceTerminator; @@ -16,6 +13,8 @@ import eva2.server.go.operators.terminators.PopulationMeasureTerminator.Stagnati import eva2.server.go.populations.Population; import eva2.server.go.populations.SolutionSet; import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; +import java.util.Arrays; +import java.util.LinkedList; /** * This implements the IPOP (increased population size restart) strategy ES, which increases diff --git a/src/eva2/server/go/strategies/FloodAlgorithm.java b/src/eva2/server/go/strategies/FloodAlgorithm.java index 64e14637..84b0dfbf 100644 --- a/src/eva2/server/go/strategies/FloodAlgorithm.java +++ b/src/eva2/server/go/strategies/FloodAlgorithm.java @@ -101,7 +101,7 @@ public class FloodAlgorithm implements InterfaceOptimizer, java.io.Serializable this.m_Population.add(i, original.get(i)); } } - this.m_CurrentFloodPeak = this.m_CurrentFloodPeak - this.m_DrainRate; + this.m_CurrentFloodPeak -= this.m_DrainRate; this.m_Population.incrGeneration(); this.firePropertyChangedEvent(Population.nextGenerationPerformed); } @@ -166,8 +166,8 @@ public class FloodAlgorithm implements InterfaceOptimizer, java.io.Serializable TmpMeanCalls += program.m_FitnessCallsNeeded; TmpMeanFitness += program.m_Best.defaultEvaulateAsMiniBits(); } - TmpMeanCalls = TmpMeanCalls/program.m_MultiRuns; - TmpMeanFitness = TmpMeanFitness/program.m_MultiRuns; + TmpMeanCalls /= program.m_MultiRuns; + TmpMeanFitness /= program.m_MultiRuns; System.out.println("("+program.m_MultiRuns+"/"+program.m_FitnessCalls+") Mean Fitness : " + TmpMeanFitness + " Mean Calls needed: " + TmpMeanCalls); } diff --git a/src/eva2/server/go/strategies/GradientDescentAlgorithm.java b/src/eva2/server/go/strategies/GradientDescentAlgorithm.java index bcc01c97..34e50469 100644 --- a/src/eva2/server/go/strategies/GradientDescentAlgorithm.java +++ b/src/eva2/server/go/strategies/GradientDescentAlgorithm.java @@ -132,8 +132,12 @@ public class GradientDescentAlgorithm implements InterfaceOptimizer, java.io.Ser // Hashtable history = new Hashtable(); int[] lock = new int[((InterfaceDataTypeDouble) indy).getDoubleData().length]; double[] wstepsize = new double[((InterfaceDataTypeDouble) indy).getDoubleData().length]; - for (int li = 0; li < lock.length; li++) lock[li] = 0; - for (int li = 0; li < lock.length; li++) wstepsize[li] = 1.0; + for (int li = 0; li < lock.length; li++) { + lock[li] = 0; + } + for (int li = 0; li < lock.length; li++) { + wstepsize[li] = 1.0; + } double fitness = 0; indy.putData(lockKey, lock); indy.putData(lastFitnessKey, new Double(fitness)); @@ -192,12 +196,12 @@ public class GradientDescentAlgorithm implements InterfaceOptimizer, java.io.Ser for (int j = 0; j < newparams.length; j++) { if (lock[j] == 0) { double tempstepsize = 1; - if (this.localStepSizeAdaption) tempstepsize = tempstepsize * wstepsize[j]; - if (this.globalStepSizeAdaption) tempstepsize = tempstepsize * indystepsize; + if (this.localStepSizeAdaption) tempstepsize *= wstepsize[j]; + if (this.globalStepSizeAdaption) tempstepsize *= indystepsize; double wchange = signum(tempstepsize * gradient[j]) * Math.min(maximumabsolutechange,Math.abs(tempstepsize * gradient[j])); //indystepsize * gradient[j]; if (this.manhattan) wchange = this.signum(wchange) * tempstepsize; if (dograddesc) { - wchange = wchange + this.momentumweigth * oldchange[j]; + wchange += this.momentumweigth * oldchange[j]; } newparams[j] = params[j] - wchange; if (newparams[j] < range[j][0]) newparams[j] = range[j][0]; @@ -223,11 +227,11 @@ public class GradientDescentAlgorithm implements InterfaceOptimizer, java.io.Ser String msg="Warning, problem of type InterfaceFirstOrderDerivableProblem and template of type InterfaceDataTypeDouble is required for " + this.getClass(); EVAERROR.errorMsgOnce(msg); Class[] clsArr = ReflectPackage.getAssignableClasses(InterfaceFirstOrderDerivableProblem.class.getName(), true, true); - msg=msg+" (available: "; + msg += " (available: "; for (Class cls: clsArr) { msg=msg+" "+cls.getSimpleName(); } - msg=msg+")"; + msg += ")"; throw new RuntimeException(msg); } } // for loop population size diff --git a/src/eva2/server/go/strategies/HillClimbing.java b/src/eva2/server/go/strategies/HillClimbing.java index df675f34..6f5de1d9 100644 --- a/src/eva2/server/go/strategies/HillClimbing.java +++ b/src/eva2/server/go/strategies/HillClimbing.java @@ -1,6 +1,5 @@ package eva2.server.go.strategies; -import eva2.gui.BeanInspector; import eva2.server.go.InterfacePopulationChangedEventListener; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.mutation.InterfaceMutation; diff --git a/src/eva2/server/go/strategies/LTGA.java b/src/eva2/server/go/strategies/LTGA.java index b4559dda..a3040bc3 100644 --- a/src/eva2/server/go/strategies/LTGA.java +++ b/src/eva2/server/go/strategies/LTGA.java @@ -1,9 +1,7 @@ package eva2.server.go.strategies; import java.util.BitSet; -import java.util.Collection; import java.util.HashSet; -import java.util.LinkedList; import java.util.Set; import java.util.Stack; import java.util.logging.Level; diff --git a/src/eva2/server/go/strategies/MLTGA.java b/src/eva2/server/go/strategies/MLTGA.java index 122c995c..50d1a770 100644 --- a/src/eva2/server/go/strategies/MLTGA.java +++ b/src/eva2/server/go/strategies/MLTGA.java @@ -1,9 +1,7 @@ package eva2.server.go.strategies; import java.util.BitSet; -import java.util.Collection; import java.util.HashSet; -import java.util.LinkedList; import java.util.Set; import java.util.Stack; import java.util.logging.Level; diff --git a/src/eva2/server/go/strategies/MemeticAlgorithm.java b/src/eva2/server/go/strategies/MemeticAlgorithm.java index 118e00fe..0d22e57b 100644 --- a/src/eva2/server/go/strategies/MemeticAlgorithm.java +++ b/src/eva2/server/go/strategies/MemeticAlgorithm.java @@ -1,7 +1,5 @@ package eva2.server.go.strategies; -import java.util.Hashtable; - import eva2.server.go.InterfacePopulationChangedEventListener; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.selection.InterfaceSelection; @@ -12,6 +10,7 @@ import eva2.server.go.populations.SolutionSet; import eva2.server.go.problems.F1Problem; import eva2.server.go.problems.InterfaceLocalSearchable; import eva2.server.go.problems.InterfaceOptimizationProblem; +import java.util.Hashtable; /** diff --git a/src/eva2/server/go/strategies/MonteCarloSearch.java b/src/eva2/server/go/strategies/MonteCarloSearch.java index c56de6a7..9a3c2bbf 100644 --- a/src/eva2/server/go/strategies/MonteCarloSearch.java +++ b/src/eva2/server/go/strategies/MonteCarloSearch.java @@ -149,8 +149,8 @@ public class MonteCarloSearch implements InterfaceOptimizer, java.io.Serializabl TmpMeanCalls += program.m_FitnessCallsNeeded; TmpMeanFitness += program.m_Best.defaultEvaulateAsMiniBits(); } - TmpMeanCalls = TmpMeanCalls/program.m_MultiRuns; - TmpMeanFitness = TmpMeanFitness/program.m_MultiRuns; + TmpMeanCalls /= program.m_MultiRuns; + TmpMeanFitness /= program.m_MultiRuns; System.out.println("("+program.m_MultiRuns+"/"+program.m_FitnessCalls+") Mean Fitness : " + TmpMeanFitness + " Mean Calls needed: " + TmpMeanCalls); } diff --git a/src/eva2/server/go/strategies/MultiObjectiveCMAES.java b/src/eva2/server/go/strategies/MultiObjectiveCMAES.java index b3755532..d5df1752 100644 --- a/src/eva2/server/go/strategies/MultiObjectiveCMAES.java +++ b/src/eva2/server/go/strategies/MultiObjectiveCMAES.java @@ -1,8 +1,5 @@ package eva2.server.go.strategies; -import java.io.Serializable; -import java.util.HashMap; - import eva2.gui.GenericObjectEditor; import eva2.server.go.InterfacePopulationChangedEventListener; import eva2.server.go.individuals.AbstractEAIndividual; @@ -14,6 +11,8 @@ import eva2.server.go.populations.Population; import eva2.server.go.populations.SolutionSet; import eva2.server.go.problems.AbstractOptimizationProblem; import eva2.server.go.problems.InterfaceOptimizationProblem; +import java.io.Serializable; +import java.util.HashMap; /** * diff --git a/src/eva2/server/go/strategies/MultiObjectiveEA.java b/src/eva2/server/go/strategies/MultiObjectiveEA.java index d66d7854..bced3ba9 100644 --- a/src/eva2/server/go/strategies/MultiObjectiveEA.java +++ b/src/eva2/server/go/strategies/MultiObjectiveEA.java @@ -141,7 +141,9 @@ public class MultiObjectiveEA implements InterfaceOptimizer, java.io.Serializabl if (pop.getArchive() != null) tmp.addPopulation(pop.getArchive()); double[][] fitness = new double[tmp.size()][]; - for (int i = 0; i < tmp.size(); i++) fitness[i] = ((AbstractEAIndividual)tmp.get(i)).getFitness(); + for (int i = 0; i < tmp.size(); i++) { + fitness[i] = ((AbstractEAIndividual)tmp.get(i)).getFitness(); + } double[] minY, maxY; minY = fitness[0]; maxY = fitness[0]; diff --git a/src/eva2/server/go/strategies/NelderMeadSimplex.java b/src/eva2/server/go/strategies/NelderMeadSimplex.java index 0efdf824..52beb40c 100644 --- a/src/eva2/server/go/strategies/NelderMeadSimplex.java +++ b/src/eva2/server/go/strategies/NelderMeadSimplex.java @@ -1,8 +1,5 @@ package eva2.server.go.strategies; -import java.io.Serializable; -import java.util.Vector; - import eva2.gui.BeanInspector; import eva2.server.go.InterfacePopulationChangedEventListener; import eva2.server.go.individuals.AbstractEAIndividual; @@ -14,6 +11,8 @@ import eva2.server.go.problems.AbstractOptimizationProblem; import eva2.server.go.problems.AbstractProblemDouble; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; +import java.io.Serializable; +import java.util.Vector; /** * Nelder-Mead-Simplex does not guarantee an equal number of evaluations within each optimize call @@ -105,7 +104,9 @@ public class NelderMeadSimplex implements InterfaceOptimizer, Serializable, Inte protected double[] calcChallengeVect(double[] centroid, double[] refX) { double[] r = new double[centroid.length]; - for (int i=0; i Expansion double[] e = new double[dim]; - for (int i=0; i distVects) { // d[0]*m[0][0], d[1]*m[0][1] etc. double[] res = new double[distVects.size()]; - for (int i=0; i=iterationCounter; i--) sumDataCollection.remove(i); + for (int i=sumDataCollection.size()-1; i>=iterationCounter; i--) { + sumDataCollection.remove(i); + } } optRunsPerformed++; functionCallSum += functionCalls; @@ -437,10 +440,14 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter if (printFinalVerbosity() && (statDataSumOverAll != null)) { printToTextListener(" Averaged sum of run statistical data: (" + optRunsPerformed + " runs):"); - for (int i=0; i list) { double[] sumFit = list.get(0).getFitness().clone(); - for (int i=1; i list) { ArrayList dblAList = new ArrayList(list.size()); - for (int i=0; i(); - for (String f : j.getFieldHeaders()) lSoFar.add(f); + for (String f : j.getFieldHeaders()) { + lSoFar.add(f); + } } else { for (String f : lSoFar) { if (j.getFieldIndex(f)>=0) tmpL.add(f); diff --git a/src/eva2/server/stat/EvAStatisticalEvaluationParams.java b/src/eva2/server/stat/EvAStatisticalEvaluationParams.java index 4feaa9e2..8593af73 100644 --- a/src/eva2/server/stat/EvAStatisticalEvaluationParams.java +++ b/src/eva2/server/stat/EvAStatisticalEvaluationParams.java @@ -1,12 +1,10 @@ package eva2.server.stat; +import eva2.tools.StringSelection; import java.io.Serializable; import java.util.List; - import javax.swing.JButton; -import eva2.tools.StringSelection; - public class EvAStatisticalEvaluationParams implements Serializable { private StringSelection singleStats = new StringSelection(StatsOnSingleDataSetEnum.mean, StatsOnSingleDataSetEnum.getInfoStrings()); diff --git a/src/eva2/server/stat/InterfaceStatistics.java b/src/eva2/server/stat/InterfaceStatistics.java index b0d9bfbe..7700f7e1 100644 --- a/src/eva2/server/stat/InterfaceStatistics.java +++ b/src/eva2/server/stat/InterfaceStatistics.java @@ -12,13 +12,12 @@ package eva2.server.stat; /*==========================================================================* * IMPORTS *==========================================================================*/ -import java.util.List; - import eva2.server.go.IndividualInterface; import eva2.server.go.PopulationInterface; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; import eva2.server.go.strategies.InterfaceOptimizer; +import java.util.List; /*==========================================================================* * INTERFACE DECLARATION *==========================================================================*/ diff --git a/src/eva2/server/stat/MovingAverage.java b/src/eva2/server/stat/MovingAverage.java index 9fdee11b..5116895c 100644 --- a/src/eva2/server/stat/MovingAverage.java +++ b/src/eva2/server/stat/MovingAverage.java @@ -64,9 +64,9 @@ public class MovingAverage { if (m_overflow) // MK 12/06 tail = m_size; for (int i=0;i>(m_StatsParams.getMultiRuns()); List description = getOutputHeaderFieldNames(informerList); m_ResultHeaderStrings = new ArrayList(); - for (String str : description) m_ResultHeaderStrings.add(str); - for (int i = 0; i < m_StatsParams.getMultiRuns(); i++) - m_ResultData.add(new ArrayList()); + for (String str : description) { + m_ResultHeaderStrings.add(str); + } + for (int i = 0; i < m_StatsParams.getMultiRuns(); i++) { + m_ResultData.add(new ArrayList()); + } } else { m_ResultData=null; m_ResultHeaderStrings = null; diff --git a/src/eva2/server/stat/StatisticsWithGUI.java b/src/eva2/server/stat/StatisticsWithGUI.java index 1484d6fe..153ca3b1 100644 --- a/src/eva2/server/stat/StatisticsWithGUI.java +++ b/src/eva2/server/stat/StatisticsWithGUI.java @@ -25,7 +25,6 @@ import eva2.gui.JTextoutputFrame; import eva2.gui.JTextoutputFrameInterface; import eva2.gui.Plot; import eva2.gui.PlotInterface; -import eva2.server.EvAServer; import eva2.server.go.PopulationInterface; import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; import eva2.tools.EVAERROR; @@ -286,7 +285,7 @@ public class StatisticsWithGUI extends AbstractStatistics implements Serializabl } if (doTextOutput()) { String s = "calls , " + calls + " bestfit , "; - s = s + BeanInspector.toString(currentBestFit); + s += BeanInspector.toString(currentBestFit); if (currentWorstFit != null) { s = s + " , worstfit , " + BeanInspector.toString(currentWorstFit); } diff --git a/src/eva2/tools/BasicResourceLoader.java b/src/eva2/tools/BasicResourceLoader.java index 2bd00004..7384019c 100644 --- a/src/eva2/tools/BasicResourceLoader.java +++ b/src/eva2/tools/BasicResourceLoader.java @@ -203,7 +203,9 @@ public class BasicResourceLoader implements ResourceLoader } private static void trimAll(String[] entries) { - for (int i=0; ithis.x[this.npoints-1]){ // System.out.println(xx); - xx = xx - 0.00001; + xx -= 0.00001; //throw new IllegalArgumentException("x is outside the range of data points"); } diff --git a/src/eva2/tools/EVAHELP.java b/src/eva2/tools/EVAHELP.java index f00fd0d3..49ca6e60 100644 --- a/src/eva2/tools/EVAHELP.java +++ b/src/eva2/tools/EVAHELP.java @@ -45,7 +45,7 @@ public class EVAHELP { String line = null; while ((line = in.readLine()) != null) { //System.out.println(line); - Out = Out + line; + Out += line; } } catch (Exception e) { System.out.println("Error in calling the command:" + e.getMessage()); diff --git a/src/eva2/tools/KMEANSJAVA.java b/src/eva2/tools/KMEANSJAVA.java index b3aea968..5c47195c 100644 --- a/src/eva2/tools/KMEANSJAVA.java +++ b/src/eva2/tools/KMEANSJAVA.java @@ -12,9 +12,8 @@ package eva2.tools; /*==========================================================================* * IMPORTS *==========================================================================*/ -import java.util.Comparator; - import eva2.tools.math.RNG; +import java.util.Comparator; /** * */ @@ -39,8 +38,9 @@ public class KMEANSJAVA { */ private double dist (double[] x1,double[] x2) { double ret = 0; - for (int i=0;isamples.length) K = samples.length; int counter=0; m_C = new double[K][]; - for (int i=0;i> { boolean useHead = true; diff --git a/src/eva2/tools/ReflectPackage.java b/src/eva2/tools/ReflectPackage.java index 20e615b9..eed29971 100644 --- a/src/eva2/tools/ReflectPackage.java +++ b/src/eva2/tools/ReflectPackage.java @@ -1,5 +1,6 @@ package eva2.tools; +import eva2.gui.BeanInspector; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -15,12 +16,9 @@ import java.util.HashSet; import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; - import javax.management.MBeanServer; import javax.management.ObjectName; -import eva2.gui.BeanInspector; - /** * Allow for java to list Classes that exist in one package and can be instantiated from @@ -363,7 +361,9 @@ public class ReflectPackage { ArrayList valids = getValidCPEntries(); // vp = valids.toArray(dynCP); // this causes Matlab to crash meanly. String[] vp = new String[valids.size()]; - for (int i=0; i clz = Class.forName(clsName); Class[] argClz=new Class[args.length]; - for (int i=0; i ct; try { ct = clz.getConstructor(argClz); diff --git a/src/eva2/tools/ServerPingThread.java b/src/eva2/tools/ServerPingThread.java index c9368c34..fa33902e 100644 --- a/src/eva2/tools/ServerPingThread.java +++ b/src/eva2/tools/ServerPingThread.java @@ -1,11 +1,10 @@ package eva2.tools; -import java.util.StringTokenizer; -import java.rmi.Naming; - import eva2.server.EvAMainAdapter; import eva2.server.EvAMainAdapterImpl; import eva2.tools.jproxy.RMIInvocationHandler; +import java.rmi.Naming; +import java.util.StringTokenizer; /** *

Title: EvA2

diff --git a/src/eva2/tools/StringSelection.java b/src/eva2/tools/StringSelection.java index 56a2e104..6ce59066 100644 --- a/src/eva2/tools/StringSelection.java +++ b/src/eva2/tools/StringSelection.java @@ -1,5 +1,6 @@ package eva2.tools; +import eva2.gui.BeanInspector; import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; @@ -7,8 +8,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import eva2.gui.BeanInspector; - /** * An array of Strings that can be selected and deselected. May be created directly from an Enum. * An analogous set of descriptive strings may be added for each field, for example to produce diff --git a/src/eva2/tools/StringTools.java b/src/eva2/tools/StringTools.java index 82ce3a80..d6bb8d2a 100644 --- a/src/eva2/tools/StringTools.java +++ b/src/eva2/tools/StringTools.java @@ -171,7 +171,9 @@ public final class StringTools { if (printErrorsOnUnrecog) { if (unrecogs.length>0) { System.err.println("Unrecognized command line options: "); - for (int i=0; i map = new HashMap(); diff --git a/src/eva2/tools/ToolBoxGui.java b/src/eva2/tools/ToolBoxGui.java index 773fd756..fbc1b5dd 100644 --- a/src/eva2/tools/ToolBoxGui.java +++ b/src/eva2/tools/ToolBoxGui.java @@ -1,7 +1,6 @@ package eva2.tools; import java.awt.Component; - import java.awt.Toolkit; import javax.swing.*; diff --git a/src/eva2/tools/URLGetter.java b/src/eva2/tools/URLGetter.java index 6448c183..60942eb3 100644 --- a/src/eva2/tools/URLGetter.java +++ b/src/eva2/tools/URLGetter.java @@ -1,7 +1,7 @@ package eva2.tools; -import java.net.*; import java.io.BufferedReader; import java.io.InputStreamReader; +import java.net.*; /** *

Title: EvA2

*

Description:

diff --git a/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java b/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java index cc337fa3..22296986 100644 --- a/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java +++ b/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java @@ -1,17 +1,15 @@ package eva2.tools.chart2d; -import javax.swing.*; - import eva2.gui.InterfaceDPointWithContent; import eva2.gui.InterfaceSelectablePointIcon; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; import eva2.server.go.problems.InterfaceOptimizationProblem; - import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import javax.swing.*; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/tools/chart2d/Chart2DDPointIconContent.java b/src/eva2/tools/chart2d/Chart2DDPointIconContent.java index b531f302..c279a3f1 100644 --- a/src/eva2/tools/chart2d/Chart2DDPointIconContent.java +++ b/src/eva2/tools/chart2d/Chart2DDPointIconContent.java @@ -1,16 +1,13 @@ package eva2.tools.chart2d; -import java.awt.*; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - - -import javax.swing.*; - import eva2.gui.InterfaceDPointWithContent; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.problems.InterfaceOptimizationProblem; +import java.awt.*; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.*; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/tools/chart2d/DArea.java b/src/eva2/tools/chart2d/DArea.java index 7189a710..762b8010 100644 --- a/src/eva2/tools/chart2d/DArea.java +++ b/src/eva2/tools/chart2d/DArea.java @@ -12,6 +12,7 @@ package eva2.tools.chart2d; +import eva2.tools.print.PagePrinter; import java.awt.Color; import java.awt.Dimension; import java.awt.FontMetrics; @@ -19,12 +20,9 @@ import java.awt.Graphics; import java.awt.Point; import java.awt.print.PageFormat; import java.awt.print.Printable; - import javax.swing.JComponent; import javax.swing.border.Border; -import eva2.tools.print.PagePrinter; - /*==========================================================================* * IMPORTS *==========================================================================*/ diff --git a/src/eva2/tools/chart2d/DArray.java b/src/eva2/tools/chart2d/DArray.java index 62e80924..4673c6dd 100644 --- a/src/eva2/tools/chart2d/DArray.java +++ b/src/eva2/tools/chart2d/DArray.java @@ -209,8 +209,9 @@ public class DArray implements DIntDoubleMap{ if( comp.max != max ) return false; if( comp.min != min ) return false; if( comp.minPositive != minPositive) return false; - for( int i=0; i 0){ for(int k=0; k<2; k++){ // double secondFraction = 0.0; switch(this.scoringMethod){ - case BDM: result = result + Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; - case K2: result = result + Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; - case BIC: result = result + secondFractionBIC(pop2, currentNode, k, j); break; + case BDM: result += Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; + case K2: result += Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; + case BIC: result += secondFractionBIC(pop2, currentNode, k, j); break; } // result = result + Math.log(secondFraction); } @@ -579,25 +578,25 @@ public class BayNet { } double[] pTable = currentNode.getPTable(); switch(this.scoringMethod){ - case BIC: result = result - (Math.log(pop.size()) * pTable.length * 2)/2;break; + case BIC: result -= (Math.log(pop.size()) * pTable.length * 2)/2;break; default: break; } for(int j=0; j 0){ for(int k=0; k<2; k++){ // double secondFraction = 0.0; switch(this.scoringMethod){ - case BDM: result = result + Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; - case K2: result = result + Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; - case BIC: result = result + secondFractionBIC(pop2, currentNode, k, j); break; + case BDM: result += Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; + case K2: result += Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; + case BIC: result += secondFractionBIC(pop2, currentNode, k, j); break; } // result = result + Math.log(secondFraction); } @@ -620,22 +619,22 @@ public class BayNet { } double[] pTable = currentNode.getPTable(); switch(this.scoringMethod){ - case BIC: result = result - (Math.log(pop.size()) * pTable.length * 2)/2;break; + case BIC: result -= (Math.log(pop.size()) * pTable.length * 2)/2;break; default: break; } for(int j=0; j 0){ for(int k=0; k<2; k++){ switch(this.scoringMethod){ - case BDM: result = result + Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; - case K2: result = result + Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; - case BIC: result = result + secondFractionBIC(pop2, currentNode, k, j); break; + case BDM: result += Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; + case K2: result += Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; + case BIC: result += secondFractionBIC(pop2, currentNode, k, j); break; } } } @@ -668,22 +667,22 @@ public class BayNet { } double[] pTable = currentNode.getPTable(); switch(this.scoringMethod){ - case BIC: result = result - (Math.log(pop.size()) * pTable.length * 2)/2;break; + case BIC: result -= (Math.log(pop.size()) * pTable.length * 2)/2;break; default: break; } for(int j=0; j 0){ for(int k=0; k<2; k++){ switch(this.scoringMethod){ - case BDM: result = result + Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; - case K2: result = result + Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; - case BIC: result = result + secondFractionBIC(pop2, currentNode, k, j); break; + case BDM: result += Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; + case K2: result += Math.log(secondFractionBDM(pop, currentNode, parents, j, pop2, k)); break; + case BIC: result += secondFractionBIC(pop2, currentNode, k, j); break; } } } @@ -850,9 +849,10 @@ public class BayNet { // setting up the number in reverse order int mask = 1; - for (int i = 0; i < length; ++i, mask <<= 1) - if ((mask & absValue) > 0) - bitSet.set(offset + i); + for (int i = 0; i < length; ++i, mask <<= 1) { + if ((mask & absValue) > 0) + bitSet.set(offset + i); + } // setting up the sign if (value < 0) @@ -897,21 +897,21 @@ public class BayNet { public String generateYFilesCode(){ String result = "\n"; - result = result + "\n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; + result += "\n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; for(int i=0; i pair = generateTable(i); Integer length = pair.getHead(); @@ -921,42 +921,42 @@ public class BayNet { Double height = 40+11*Math.pow(2, length-1); Double width = (double) (40+10*length); result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; + result += " \n"; + result += " \n"; + result += " \n"; result = result + " \n"; - result = result + " \n"; - result = result + " \n"; + result += " \n"; + result += " \n"; result = result + " " + i + table + "\n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; } int cnt = 0; for(int i=0; i\n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; cnt++; } } } - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + " \n"; - result = result + "\n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += " \n"; + result += "\n"; return result; } @@ -965,13 +965,13 @@ public class BayNet { double [] pTable = nodes[i].getPTable(); int length = Integer.toBinaryString(pTable.length).length(); for(int j=0; j p = new Pair(); p.setHead(length); diff --git a/src/eva2/tools/math/Jama/CholeskyDecomposition.java b/src/eva2/tools/math/Jama/CholeskyDecomposition.java index 42c9e424..b2171a1a 100644 --- a/src/eva2/tools/math/Jama/CholeskyDecomposition.java +++ b/src/eva2/tools/math/Jama/CholeskyDecomposition.java @@ -57,11 +57,11 @@ public class CholeskyDecomposition implements java.io.Serializable { s += Lrowk[i]*Lrowj[i]; } Lrowj[k] = s = (A[j][k] - s)/L[k][k]; - d = d + s*s; - isspd = isspd & (A[k][j] == A[j][k]); + d += s*s; + isspd &= (A[k][j] == A[j][k]); } d = A[j][j] - d; - isspd = isspd & (d > 0.0); + isspd &= (d > 0.0); L[j][j] = Math.sqrt(Math.max(d,0.0)); for (int k = j+1; k < n; k++) { L[j][k] = 0.0; @@ -98,14 +98,14 @@ public class CholeskyDecomposition implements java.io.Serializable { for (int k = 0; k < j; k++) { double s = A[k][j]; for (int i = 0; i < k; i++) { - s = s - R[i][k]*R[i][j]; + s -= R[i][k]*R[i][j]; } - R[k][j] = s = s/R[k][k]; - d = d + s*s; - isspd = isspd & (A[k][j] == A[j][k]); + R[k][j] = s /= R[k][k]; + d += s*s; + isspd &= (A[k][j] == A[j][k]); } d = A[j][j] - d; - isspd = isspd & (d > 0.0); + isspd &= (d > 0.0); R[j][j] = Math.sqrt(Math.max(d,0.0)); for (int k = j+1; k < n; k++) { R[k][j] = 0.0; diff --git a/src/eva2/tools/math/Jama/EigenvalueDecomposition.java b/src/eva2/tools/math/Jama/EigenvalueDecomposition.java index a117ddb8..c150c787 100644 --- a/src/eva2/tools/math/Jama/EigenvalueDecomposition.java +++ b/src/eva2/tools/math/Jama/EigenvalueDecomposition.java @@ -80,7 +80,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { double scale = 0.0; double h = 0.0; for (int k = 0; k < i; k++) { - scale = scale + Math.abs(d[k]); + scale += Math.abs(d[k]); } if (scale == 0.0) { e[i] = d[i-1]; @@ -103,7 +103,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { g = -g; } e[i] = scale * g; - h = h - f * g; + h -= f * g; d[i-1] = f - g; for (int j = 0; j < i; j++) { e[j] = 0.0; @@ -211,7 +211,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { if (m > l) { int iter = 0; do { - iter = iter + 1; // (Could check iteration count here.) + iter += 1; // (Could check iteration count here.) // Compute implicit shift @@ -228,7 +228,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { for (int i = l+2; i < n; i++) { d[i] -= h; } - f = f + h; + f += h; // Implicit QL transformation. @@ -268,7 +268,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { } while (Math.abs(e[l]) > eps*tst1); } - d[l] = d[l] + f; + d[l] += f; e[l] = 0.0; } @@ -313,7 +313,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { double scale = 0.0; for (int i = m; i <= high; i++) { - scale = scale + Math.abs(H[i][m-1]); + scale += Math.abs(H[i][m-1]); } if (scale != 0.0) { @@ -328,8 +328,8 @@ public class EigenvalueDecomposition implements java.io.Serializable { if (ort[m] > 0) { g = -g; } - h = h - ort[m] * g; - ort[m] = ort[m] - g; + h -= ort[m] * g; + ort[m] -= g; // Apply Householder similarity transformation // H = (I-u*u'/h)*H*(I-u*u')/h) @@ -339,7 +339,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { for (int i = high; i >= m; i--) { f += ort[i]*H[i][j]; } - f = f/h; + f /= h; for (int i = m; i <= high; i++) { H[i][j] -= f*ort[i]; } @@ -350,7 +350,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { for (int j = high; j >= m; j--) { f += ort[j]*H[i][j]; } - f = f/h; + f /= h; for (int j = m; j <= high; j++) { H[i][j] -= f*ort[j]; } @@ -436,7 +436,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { e[i] = 0.0; } for (int j = Math.max(i-1,0); j < nn; j++) { - norm = norm + Math.abs(H[i][j]); + norm += Math.abs(H[i][j]); } } @@ -463,7 +463,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { // One root found if (l == n) { - H[n][n] = H[n][n] + exshift; + H[n][n] += exshift; d[n] = H[n][n]; e[n] = 0.0; n--; @@ -476,8 +476,8 @@ public class EigenvalueDecomposition implements java.io.Serializable { p = (H[n-1][n-1] - H[n][n]) / 2.0; q = p * p + w; z = Math.sqrt(Math.abs(q)); - H[n][n] = H[n][n] + exshift; - H[n-1][n-1] = H[n-1][n-1] + exshift; + H[n][n] += exshift; + H[n-1][n-1] += exshift; x = H[n][n]; // Real pair @@ -500,8 +500,8 @@ public class EigenvalueDecomposition implements java.io.Serializable { p = x / s; q = z / s; r = Math.sqrt(p * p+q * q); - p = p / r; - q = q / r; + p /= r; + q /= r; // Row modification @@ -535,7 +535,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { e[n-1] = z; e[n] = -z; } - n = n - 2; + n -= 2; iter = 0; // No convergence yet @@ -583,7 +583,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { } } - iter = iter + 1; // (Could check iteration count here.) + iter += 1; // (Could check iteration count here.) // Look for two consecutive small sub-diagonal elements @@ -596,9 +596,9 @@ public class EigenvalueDecomposition implements java.io.Serializable { q = H[m+1][m+1] - z - r - s; r = H[m+2][m+1]; s = Math.abs(p) + Math.abs(q) + Math.abs(r); - p = p / s; - q = q / s; - r = r / s; + p /= s; + q /= s; + r /= s; if (m == l) { break; } @@ -627,9 +627,9 @@ public class EigenvalueDecomposition implements java.io.Serializable { r = (notlast ? H[k+2][k-1] : 0.0); x = Math.abs(p) + Math.abs(q) + Math.abs(r); if (x != 0.0) { - p = p / x; - q = q / x; - r = r / x; + p /= x; + q /= x; + r /= x; } } if (x == 0.0) { @@ -645,23 +645,23 @@ public class EigenvalueDecomposition implements java.io.Serializable { } else if (l != m) { H[k][k-1] = -H[k][k-1]; } - p = p + s; + p += s; x = p / s; y = q / s; z = r / s; - q = q / p; - r = r / p; + q /= p; + r /= p; // Row modification for (int j = k; j < nn; j++) { p = H[k][j] + q * H[k+1][j]; if (notlast) { - p = p + r * H[k+2][j]; - H[k+2][j] = H[k+2][j] - p * z; + p += r * H[k+2][j]; + H[k+2][j] -= p * z; } - H[k][j] = H[k][j] - p * x; - H[k+1][j] = H[k+1][j] - p * y; + H[k][j] -= p * x; + H[k+1][j] -= p * y; } // Column modification @@ -669,11 +669,11 @@ public class EigenvalueDecomposition implements java.io.Serializable { for (int i = 0; i <= Math.min(n,k+3); i++) { p = x * H[i][k] + y * H[i][k+1]; if (notlast) { - p = p + z * H[i][k+2]; - H[i][k+2] = H[i][k+2] - p * r; + p += z * H[i][k+2]; + H[i][k+2] -= p * r; } - H[i][k] = H[i][k] - p; - H[i][k+1] = H[i][k+1] - p * q; + H[i][k] -= p; + H[i][k+1] -= p * q; } // Accumulate transformations @@ -681,11 +681,11 @@ public class EigenvalueDecomposition implements java.io.Serializable { for (int i = low; i <= high; i++) { p = x * V[i][k] + y * V[i][k+1]; if (notlast) { - p = p + z * V[i][k+2]; - V[i][k+2] = V[i][k+2] - p * r; + p += z * V[i][k+2]; + V[i][k+2] -= p * r; } - V[i][k] = V[i][k] - p; - V[i][k+1] = V[i][k+1] - p * q; + V[i][k] -= p; + V[i][k+1] -= p * q; } } // (s != 0) } // k loop @@ -711,7 +711,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { w = H[i][i] - p; r = 0.0; for (int j = l; j <= n; j++) { - r = r + H[i][j] * H[j][n]; + r += H[i][j] * H[j][n]; } if (e[i] < 0.0) { z = w; @@ -745,7 +745,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { t = Math.abs(H[i][n]); if ((eps * t) * t > 1) { for (int j = i; j <= n; j++) { - H[j][n] = H[j][n] / t; + H[j][n] /= t; } } } @@ -773,8 +773,8 @@ public class EigenvalueDecomposition implements java.io.Serializable { ra = 0.0; sa = 0.0; for (int j = l; j <= n; j++) { - ra = ra + H[i][j] * H[j][n-1]; - sa = sa + H[i][j] * H[j][n]; + ra += H[i][j] * H[j][n-1]; + sa += H[i][j] * H[j][n]; } w = H[i][i] - p; @@ -818,8 +818,8 @@ public class EigenvalueDecomposition implements java.io.Serializable { t = Math.max(Math.abs(H[i][n-1]),Math.abs(H[i][n])); if ((eps * t) * t > 1) { for (int j = i; j <= n; j++) { - H[j][n-1] = H[j][n-1] / t; - H[j][n] = H[j][n] / t; + H[j][n-1] /= t; + H[j][n] /= t; } } } @@ -843,7 +843,7 @@ public class EigenvalueDecomposition implements java.io.Serializable { for (int i = low; i <= high; i++) { z = 0.0; for (int k = low; k <= Math.min(j,high); k++) { - z = z + V[i][k] * H[k][j]; + z += V[i][k] * H[k][j]; } V[i][j] = z; } diff --git a/src/eva2/tools/math/Jama/Matrix.java b/src/eva2/tools/math/Jama/Matrix.java index 4442dd2a..92bfe642 100644 --- a/src/eva2/tools/math/Jama/Matrix.java +++ b/src/eva2/tools/math/Jama/Matrix.java @@ -1,6 +1,10 @@ package eva2.tools.math.Jama; +import eva2.gui.BeanInspector; +import eva2.tools.Pair; +import eva2.tools.math.Jama.util.Maths; +import eva2.tools.math.Mathematics; import java.io.BufferedReader; import java.io.PrintWriter; import java.io.Serializable; @@ -12,11 +16,6 @@ import java.util.Arrays; import java.util.Locale; import java.util.Vector; -import eva2.gui.BeanInspector; -import eva2.tools.Pair; -import eva2.tools.math.Mathematics; -import eva2.tools.math.Jama.util.Maths; - /** Jama = Java Matrix class. @@ -260,7 +259,9 @@ public class Matrix implements Cloneable, Serializable { */ public Matrix getDiagonalMatrix() { double[][] D = new double[m][n]; - for (int i=0; i= 0; j--) - y = y * x + polynomialCoefficients[j]; + for (int j = n - 1; j >= 0; j--) { + y = y * x + polynomialCoefficients[j]; + } return y; } @@ -159,13 +160,15 @@ public class PolyInterpolation double cnst = 1.0; pd[0] = polynomialCoefficients[nc]; - for (j = 1; j <= ndDerivateNumber; j++) - pd[j] = 0.0; + for (j = 1; j <= ndDerivateNumber; j++) { + pd[j] = 0.0; + } for (i = nc - 1; i >= 0; i--) { nnd = (ndDerivateNumber < (nc - i) ? ndDerivateNumber : nc - i); - for (j = nnd; j >= 1; j--) - pd[j] = pd[j] * x + pd[j - 1]; + for (j = nnd; j >= 1; j--) { + pd[j] = pd[j] * x + pd[j - 1]; + } pd[0] = pd[0] * x + polynomialCoefficients[i]; } for (i = 2; i <= ndDerivateNumber; i++) diff --git a/src/eva2/tools/matlab/JMatLink.java b/src/eva2/tools/matlab/JMatLink.java index 031c2b5f..a7152f98 100644 --- a/src/eva2/tools/matlab/JMatLink.java +++ b/src/eva2/tools/matlab/JMatLink.java @@ -1766,8 +1766,9 @@ public class JMatLink extends Thread { // convert row from double to byte - for (int i = 0; i < d[n].length; i++) - b[i] = (byte) d[n][i]; + for (int i = 0; i < d[n].length; i++) { + b[i] = (byte) d[n][i]; + } // convert byte to String diff --git a/src/eva2/tools/print/PagePrinter.java b/src/eva2/tools/print/PagePrinter.java index 7829a4bf..5ffa469a 100644 --- a/src/eva2/tools/print/PagePrinter.java +++ b/src/eva2/tools/print/PagePrinter.java @@ -17,9 +17,9 @@ package eva2.tools.print; *==========================================================================*/ import java.awt.* ; -import java.awt.print.* ; -import java.awt.image.BufferedImage ; -import javax.swing.* ; +import java.awt.image.BufferedImage; +import java.awt.print.*; +import javax.swing.*; /*==========================================================================* * CLASS DECLARATION diff --git a/src/simpleprobs/SimpleB1.java b/src/simpleprobs/SimpleB1.java index 4d83307d..fc7373a9 100644 --- a/src/simpleprobs/SimpleB1.java +++ b/src/simpleprobs/SimpleB1.java @@ -12,7 +12,9 @@ public class SimpleB1 extends SimpleProblemBinary { double[] result = new double[1]; int fitness = 0; - for (int i = 0; i < getProblemDimension(); i++) if (b.get(i)) fitness++; + for (int i = 0; i < getProblemDimension(); i++) { + if (b.get(i)) fitness++; + } result[0] = fitness; return result; } diff --git a/test/eva2/tools/SerializerTest.java b/test/eva2/tools/SerializerTest.java index 3703dc08..aab4e77f 100644 --- a/test/eva2/tools/SerializerTest.java +++ b/test/eva2/tools/SerializerTest.java @@ -5,11 +5,9 @@ package eva2.tools; import java.io.*; -import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; -import org.junit.BeforeClass; /** *