From 0105c97c419a1be3083e0b3f1f3eb6b0d9c59c0f Mon Sep 17 00:00:00 2001 From: Marcel Kronfeld Date: Thu, 17 Apr 2008 13:02:11 +0000 Subject: [PATCH] Major renaming event for base package, JavaEvA -> EvA2 --- resources/{JavaEvA.props => EvA2.props} | 4 +- resources/images/JavaEvA2SplashScreen.png | Bin 43359 -> 0 bytes resources/images/JavaEvaSplashScreen.png | Bin 26655 -> 0 bytes .../images/{JavaEvAIcon.gif => icon1.gif} | Bin .../images/{JavaEvAIcon_2.gif => icon2.gif} | Bin .../images/{JavaEvAIcon_3.gif => icon3.gif} | Bin resources/images/splashScreen2.png | Bin 0 -> 42014 bytes src/{javaeva => eva2}/OptimizerFactory.java | 77 ++++---- src/{javaeva => eva2}/OptimizerRunnable.java | 31 ++-- .../client/AppExitAction.java | 6 +- src/{javaeva => eva2}/client/EvAClient.java | 79 +++----- .../client/EvAComAdapter.java | 15 +- .../client/RMIConnectionEvA.java | 7 +- src/{javaeva => eva2}/gui/BeanInspector.java | 9 +- .../gui/BigStringEditor.java | 2 +- .../gui/Chart2DDPointContentSelectable.java | 10 +- .../gui/Chart2DDPointIconCircle.java | 2 +- .../gui/Chart2DDPointIconContent.java | 7 +- .../gui/Chart2DDPointIconCross.java | 2 +- .../gui/Chart2DDPointIconPoint.java | 2 +- .../gui/Chart2DDPointIconText.java | 2 +- .../gui/ComponentFilter.java | 2 +- .../gui/DPointSetMultiIcon.java | 2 +- src/{javaeva => eva2}/gui/DataViewer.java | 2 +- .../gui/DataViewerInterface.java | 2 +- src/{javaeva => eva2}/gui/Exp.java | 2 +- src/{javaeva => eva2}/gui/ExtAction.java | 2 +- .../gui/ExtActionChangedListener.java | 2 +- .../gui/ExtDesktopManager.java | 2 +- src/{javaeva => eva2}/gui/FunctionArea.java | 7 +- .../gui/GenericAreaEditor.java | 10 +- .../gui/GenericArrayEditor.java | 8 +- .../gui/GenericDoubleArrayEditor.java | 2 +- .../gui/GenericEpsilonConstraintEditor.java | 2 +- .../gui/GenericEpsilonThresholdEditor.java | 2 +- .../gui/GenericFilePathEditor.java | 2 +- .../gui/GenericIntArrayEditor.java | 2 +- .../gui/GenericObjectEditor.java | 9 +- .../GenericOptimizationObjectivesEditor.java | 10 +- ...OptimizationObjectivesWithParamEditor.java | 8 +- .../gui/GenericRemoteServersEditor.java | 6 +- .../gui/GenericStringListEditor.java | 8 +- .../GenericWeigthedLPTchebycheffEditor.java | 2 +- src/{javaeva => eva2}/gui/Graph.java | 2 +- src/{javaeva => eva2}/gui/GraphPointSet.java | 2 +- src/{javaeva => eva2}/gui/GraphWindow.java | 2 +- src/{javaeva => eva2}/gui/HtmlDemo.java | 10 +- .../gui/InterfaceDPointWithContent.java | 6 +- .../gui/InterfaceSelectablePointIcon.java | 6 +- src/{javaeva => eva2}/gui/JClassTree.java | 2 +- src/{javaeva => eva2}/gui/JDocFrame.java | 2 +- src/{javaeva => eva2}/gui/JEFrame.java | 2 +- .../gui/JEFrameRegister.java | 2 +- .../gui/JExtDesktopPane.java | 6 +- .../gui/JExtFileChooser.java | 4 +- src/{javaeva => eva2}/gui/JExtMenu.java | 2 +- src/{javaeva => eva2}/gui/JExtToolBar.java | 2 +- .../gui/JModuleGeneralPanel.java | 5 +- src/{javaeva => eva2}/gui/JParaPanel.java | 2 +- .../gui/JTabbedModuleFrame.java | 14 +- .../gui/JTextEditorInternalFrame.java | 10 +- .../gui/JTextoutputFrame.java | 9 +- .../gui/JTextoutputFrameInterface.java | 4 +- src/{javaeva => eva2}/gui/LogPanel.java | 8 +- src/{javaeva => eva2}/gui/Mnemonic.java | 2 +- .../gui/MultiLineString.java | 2 +- .../gui/MultiLineStringEditor.java | 2 +- src/{javaeva => eva2}/gui/Plot.java | 7 +- src/{javaeva => eva2}/gui/PlotInterface.java | 2 +- .../gui/PropertyBoolSelector.java | 2 +- src/{javaeva => eva2}/gui/PropertyDialog.java | 10 +- .../gui/PropertyDoubleArray.java | 2 +- .../gui/PropertyEditorProvider.java | 11 +- .../gui/PropertyEpsilonConstraint.java | 2 +- .../gui/PropertyEpsilonThreshold.java | 2 +- .../gui/PropertyFilePath.java | 2 +- .../gui/PropertyIntArray.java | 2 +- .../gui/PropertyOptimizationObjectives.java | 4 +- ...opertyOptimizationObjectivesWithParam.java | 4 +- src/{javaeva => eva2}/gui/PropertyPanel.java | 5 +- .../gui/PropertyRemoteServers.java | 2 +- .../gui/PropertySheetPanel.java | 7 +- .../gui/PropertySheetPanelStat.java | 5 +- src/{javaeva => eva2}/gui/PropertySlider.java | 2 +- .../gui/PropertyStringList.java | 2 +- src/{javaeva => eva2}/gui/PropertyText.java | 2 +- .../gui/PropertyValueSelector.java | 2 +- .../gui/PropertyWeightedLPTchebycheff.java | 2 +- .../gui/SerializedObject.java | 2 +- .../gui/StatisticsEditor.java | 5 +- src/{javaeva => eva2}/gui/TagEditor.java | 11 +- src/{javaeva => eva2}/gui/TopoPlot.java | 5 +- src/{javaeva => eva2}/gui/TreeElement.java | 2 +- .../gui/WindowCloseAction.java | 1 + .../server/EvAMainAdapter.java | 4 +- .../server/EvAMainAdapterImpl.java | 6 +- src/{javaeva => eva2}/server/EvAServer.java | 7 +- .../server/ModuleServer.java | 90 +++++----- .../server/RMIServerEvA.java | 5 +- .../server/go/CrossoverInterface.java | 4 +- .../server/go/GOStandaloneVersion.java | 55 +++--- .../server/go/IndividualInterface.java | 2 +- .../server/go/InterfaceGOParameters.java | 10 +- .../server/go/InterfaceGOStandalone.java | 2 +- ...terfacePopulationChangedEventListener.java | 2 +- .../server/go/InterfaceProcessor.java | 2 +- .../server/go/InterfaceTerminator.java | 2 +- .../server/go/MOCCOStandalone.java | 62 +++---- .../server/go/MutationInterface.java | 4 +- .../server/go/PopulationInterface.java | 2 +- .../server/go/SelectionInterface.java | 4 +- .../server/go/SwingWorker.java | 2 +- .../go/individuals/AbstractEAIndividual.java | 168 +++++++++++++++--- .../AbstractEAIndividualComparator.java | 2 +- .../individuals/ESIndividualBinaryData.java | 44 +---- .../individuals/ESIndividualDoubleData.java | 43 +---- .../individuals/ESIndividualIntegerData.java | 43 +---- .../ESIndividualPermutationData.java | 42 +---- .../GAESIndividualBinaryDoubleData.java | 11 +- .../individuals/GAIndividualBinaryData.java | 51 ++---- .../individuals/GAIndividualDoubleData.java | 51 ++---- .../individuals/GAIndividualIntegerData.java | 50 ++---- .../individuals/GAPIndividualProgramData.java | 27 +-- .../individuals/GEIndividualProgramData.java | 47 ++--- .../individuals/GIIndividualIntegerData.java | 41 +---- ...IOBGAIndividualIntegerPermutationData.java | 11 +- .../individuals/GPIndividualProgramData.java | 55 ++---- .../individuals/InterfaceDataTypeBinary.java | 2 +- .../individuals/InterfaceDataTypeDouble.java | 2 +- .../individuals/InterfaceDataTypeInteger.java | 2 +- .../InterfaceDataTypePermutation.java | 2 +- .../individuals/InterfaceDataTypeProgram.java | 4 +- .../go/individuals/InterfaceESIndividual.java | 2 +- .../go/individuals/InterfaceGAIndividual.java | 2 +- .../go/individuals/InterfaceGIIndividual.java | 2 +- .../go/individuals/InterfaceGPIndividual.java | 4 +- .../individuals/InterfaceOBGAIndividual.java | 2 +- .../OBGAIndividualPermutationData.java | 53 +----- .../codings/ga/GAGrayCodingDouble.java | 5 +- .../codings/ga/GAGrayCodingInteger.java | 2 +- .../codings/ga/GAStandardCodingDouble.java | 2 +- .../codings/ga/GAStandardCodingInteger.java | 5 +- .../codings/ga/InterfaceGADoubleCoding.java | 2 +- .../codings/ga/InterfaceGAIntegerCoding.java | 2 +- .../codings/gp/AbstractGPNode.java | 5 +- .../go/individuals/codings/gp/GPArea.java | 5 +- .../go/individuals/codings/gp/GPNodeAdd.java | 5 +- .../go/individuals/codings/gp/GPNodeCos.java | 4 +- .../go/individuals/codings/gp/GPNodeDiv.java | 4 +- .../go/individuals/codings/gp/GPNodeExp.java | 4 +- .../codings/gp/GPNodeFlowExec2.java | 4 +- .../codings/gp/GPNodeFlowExec3.java | 4 +- .../individuals/codings/gp/GPNodeInput.java | 4 +- .../go/individuals/codings/gp/GPNodeMult.java | 4 +- .../individuals/codings/gp/GPNodeOutput.java | 4 +- .../go/individuals/codings/gp/GPNodePow2.java | 4 +- .../go/individuals/codings/gp/GPNodePow3.java | 4 +- .../go/individuals/codings/gp/GPNodeSin.java | 4 +- .../go/individuals/codings/gp/GPNodeSqrt.java | 4 +- .../go/individuals/codings/gp/GPNodeSub.java | 4 +- .../codings/gp/InterfaceProgram.java | 4 +- .../go/mocco/InterfaceProcessElement.java | 2 +- .../go/mocco/MOCCOChooseMOStrategy.java | 6 +- .../go/mocco/MOCCOChooseReferencePoint.java | 12 +- .../mocco/MOCCOChooseReferenceSolution.java | 16 +- .../go/mocco/MOCCOInitialPopulationSize.java | 10 +- .../server/go/mocco/MOCCOParameterizeGDF.java | 30 ++-- .../server/go/mocco/MOCCOParameterizeMO.java | 22 +-- .../go/mocco/MOCCOParameterizeRefPoint.java | 26 +-- .../server/go/mocco/MOCCOParameterizeSO.java | 20 ++- .../go/mocco/MOCCOParameterizeSTEP.java | 30 ++-- .../mocco/MOCCOParameterizeTchebycheff.java | 26 +-- .../server/go/mocco/MOCCOPhase.java | 15 +- .../go/mocco/MOCCOProblemInitialization.java | 20 ++- .../go/mocco/MOCCOProblemRedefinition.java | 10 +- .../server/go/mocco/MOCCOState.java | 28 +-- .../InterfaceParetoFrontView.java | 2 +- .../InterfaceRefPointListener.java | 2 +- .../InterfaceRefSolutionListener.java | 4 +- .../mocco/paretofrontviewer/MOCCOViewer.java | 22 +-- .../paretofrontviewer/ParetoFrontView2D.java | 14 +- .../ParetoFrontViewParallelAxsis.java | 2 +- .../ParetoFrontViewScatterPlot.java | 13 +- .../archiving/AbstractArchiving.java | 12 +- .../archiving/ArchivingAllDominating.java | 8 +- .../ArchivingMOMAIIAllDominating.java | 6 +- .../operators/archiving/ArchivingMaxiMin.java | 15 +- .../go/operators/archiving/ArchivingNSGA.java | 7 +- .../operators/archiving/ArchivingNSGAII.java | 17 +- .../operators/archiving/ArchivingPESAII.java | 15 +- .../operators/archiving/ArchivingSPEAII.java | 23 +-- .../InformationRetrievalInserting.java | 4 +- .../archiving/InformationRetrievalNone.java | 4 +- .../InformationRetrievalReplacing.java | 6 +- .../archiving/InterfaceArchiving.java | 4 +- .../InterfaceInformationRetrieval.java | 4 +- .../InterfaceRemoveSurplusIndividuals.java | 4 +- ...oveSurplusIndividualsDynamicHyperCube.java | 8 +- ...moveSurplusIndividualsStaticHyperCube.java | 8 +- .../ClassificationSelfOrganizingMaps.java | 7 +- .../InterfaceClassification.java | 2 +- .../cluster/ClusteringDensityBased.java | 11 +- .../operators/cluster/ClusteringKMeans.java | 28 +-- .../operators/cluster/ClusteringXMeans.java | 24 +-- .../cluster/InterfaceClustering.java | 6 +- .../ConstBelongsToDifferentClass.java | 6 +- ...tObjectivesInEqualityBiggerThanLinear.java | 4 +- ...ObjectivesInEqualityBiggerThanSurface.java | 4 +- ...tObjectivesInEqualityLesserThanLinear.java | 4 +- ...bjectivesInEqualitySmallerThanSurface.java | 4 +- .../constraint/InterfaceConstraint.java | 4 +- .../operators/crossover/CrossoverEAMixer.java | 15 +- .../crossover/CrossoverESArithmetical.java | 12 +- .../crossover/CrossoverESBLXAlpha.java | 12 +- .../crossover/CrossoverESDefault.java | 24 +-- .../operators/crossover/CrossoverESFlat.java | 15 +- .../crossover/CrossoverESIntermediate.java | 10 +- .../crossover/CrossoverESNPointDiscrete.java | 12 +- .../CrossoverESNPointDiscreteDislocation.java | 12 +- .../operators/crossover/CrossoverESPCX.java | 21 +-- .../operators/crossover/CrossoverESSBX.java | 20 +-- .../operators/crossover/CrossoverESSPX.java | 21 +-- .../operators/crossover/CrossoverESUNDX.java | 21 +-- .../crossover/CrossoverESUniformDiscrete.java | 12 +- .../crossover/CrossoverGABitSimulated.java | 13 +- .../crossover/CrossoverGADefault.java | 13 +- .../crossover/CrossoverGANPoint.java | 13 +- .../crossover/CrossoverGAUniform.java | 13 +- .../crossover/CrossoverGIDefault.java | 12 +- .../crossover/CrossoverGINPoint.java | 12 +- .../crossover/CrossoverGINPointVL.java | 13 +- .../crossover/CrossoverGIUniform.java | 13 +- .../crossover/CrossoverGPDefault.java | 15 +- .../operators/crossover/CrossoverOBGAPMX.java | 16 +- .../crossover/CrossoverOBGAPMXUniform.java | 14 +- .../crossover/InterfaceCrossover.java | 8 +- .../go/operators/crossover/NoCrossover.java | 8 +- .../crossover/PropertyCrossoverMixer.java | 2 +- .../PropertyCrossoverMixerEditor.java | 10 +- .../operators/crossover/TestESCrossover.java | 34 ++-- .../distancemetric/GenotypeMetricBitSet.java | 9 +- .../InterfaceDistanceMetric.java | 4 +- .../distancemetric/ObjectiveSpaceMetric.java | 6 +- .../distancemetric/PhenotypeMetric.java | 19 +- .../SigmaSingleMetricGlobalMutation.java | 8 +- .../FitnessAdaptiveClustering.java | 10 +- .../fitnessmodifier/FitnessModifierNone.java | 4 +- .../fitnessmodifier/FitnessSharing.java | 10 +- .../InterfaceFitnessModifier.java | 4 +- .../migration/InterfaceMigration.java | 4 +- .../operators/migration/MOBestMigration.java | 12 +- .../migration/MOClusteringSeparation.java | 43 ++--- .../operators/migration/MOConeSeparation.java | 47 ++--- .../migration/MOXMeansSeparation.java | 37 ++-- .../operators/migration/SOBestMigration.java | 12 +- .../operators/migration/SOMONoMigration.java | 10 +- .../moso/InterfaceMOSOConverter.java | 6 +- .../moso/MOSODynamicallyWeightedFitness.java | 8 +- .../operators/moso/MOSOEpsilonConstraint.java | 10 +- .../operators/moso/MOSOEpsilonThreshold.java | 10 +- .../operators/moso/MOSOGoalProgramming.java | 8 +- .../go/operators/moso/MOSOLpMetric.java | 8 +- .../go/operators/moso/MOSOMOGARankBased.java | 8 +- .../server/go/operators/moso/MOSOMaxiMin.java | 16 +- .../go/operators/moso/MOSONoConvert.java | 8 +- .../go/operators/moso/MOSORandomChoice.java | 8 +- .../go/operators/moso/MOSORandomWeight.java | 10 +- .../go/operators/moso/MOSORankbased.java | 10 +- .../operators/moso/MOSOUtilityFunction.java | 6 +- .../operators/moso/MOSOWeightedFitness.java | 8 +- .../moso/MOSOWeightedLPTchebycheff.java | 8 +- .../operators/mutation/InterfaceMutation.java | 8 +- .../go/operators/mutation/MutateEAMixer.java | 15 +- .../mutation/MutateESCorrolated.java | 12 +- .../MutateESCovarianceMartixAdaption.java | 12 +- .../operators/mutation/MutateESDefault.java | 10 +- .../mutation/MutateESDerandomized.java | 12 +- .../mutation/MutateESFixedStepSize.java | 12 +- .../go/operators/mutation/MutateESGlobal.java | 15 +- .../go/operators/mutation/MutateESLocal.java | 19 +- .../mutation/MutateESMainVectorAdaption.java | 12 +- .../MutateESMutativeStepSizeControl.java | 12 +- .../operators/mutation/MutateESStandard.java | 14 +- .../mutation/MutateESSuccessRule.java | 12 +- .../operators/mutation/MutateGAAdaptive.java | 13 +- .../operators/mutation/MutateGADefault.java | 10 +- .../mutation/MutateGAInvertBits.java | 13 +- .../operators/mutation/MutateGAStandard.java | 13 +- .../operators/mutation/MutateGASwapBits.java | 13 +- .../operators/mutation/MutateGIDefault.java | 10 +- .../mutation/MutateGIInsertDelete.java | 12 +- .../go/operators/mutation/MutateGIInvert.java | 12 +- .../operators/mutation/MutateGINominal.java | 12 +- .../operators/mutation/MutateGIOrdinal.java | 12 +- .../mutation/MutateGITranslocate.java | 12 +- .../operators/mutation/MutateGPAdaptive.java | 15 +- .../operators/mutation/MutateGPDefault.java | 10 +- .../mutation/MutateGPSingleNode.java | 19 +- .../go/operators/mutation/MutateOBGAFlip.java | 14 +- .../mutation/MutateOBGAInversion.java | 14 +- .../go/operators/mutation/NoMutation.java | 8 +- .../mutation/PropertyMutationMixer.java | 2 +- .../mutation/PropertyMutationMixerEditor.java | 10 +- .../InterfaceParetoFrontMetric.java | 6 +- .../MetricD1ApproxParetoFront.java | 17 +- .../MetricD1TrueParetoFront.java | 17 +- .../paretofrontmetrics/MetricErrorRatio.java | 17 +- .../MetricMaximumParetoFrontError.java | 17 +- .../MetricOverallNonDominatedVectors.java | 10 +- .../operators/paretofrontmetrics/MetricS.java | 12 +- .../MetricSWithReference.java | 19 +- .../InterfacePostProcessParams.java | 2 +- .../go/operators/postprocess/PostProcess.java | 43 ++--- .../postprocess/PostProcessParams.java | 5 +- .../selection/InterfaceSelection.java | 6 +- .../selection/MOMultipleSolutions.java | 2 +- .../go/operators/selection/MOSolution.java | 2 +- .../go/operators/selection/SelectAll.java | 8 +- .../go/operators/selection/SelectBest.java | 8 +- .../selection/SelectBestIndividuals.java | 9 +- .../selection/SelectEPTournaments.java | 9 +- .../selection/SelectHomologousMate.java | 13 +- .../SelectMOMAIIDominanceCounter.java | 8 +- .../operators/selection/SelectMOMaxiMin.java | 10 +- .../SelectMONSGAIICrowedTournament.java | 10 +- .../selection/SelectMONonDominated.java | 8 +- .../go/operators/selection/SelectMOPESA.java | 12 +- .../operators/selection/SelectMOPESAII.java | 11 +- .../operators/selection/SelectMOSPEAII.java | 22 +-- .../selection/SelectParticleWheel.java | 14 +- .../go/operators/selection/SelectRandom.java | 8 +- .../operators/selection/SelectTournament.java | 8 +- .../selection/SelectXProbRouletteWheel.java | 12 +- .../probability/AbstractSelProb.java | 7 +- .../InterfaceSelectionProbability.java | 4 +- .../probability/SelProbBoltzman.java | 6 +- .../probability/SelProbFitnessSharing.java | 10 +- .../probability/SelProbInvertByMax.java | 6 +- .../probability/SelProbLinearRanking.java | 6 +- .../probability/SelProbNonLinearRanking.java | 6 +- .../selection/probability/SelProbRanking.java | 6 +- .../probability/SelProbStandard.java | 6 +- .../probability/SelProbStandardScaling.java | 6 +- .../replacement/InterfaceReplacement.java | 6 +- .../replacement/PreplacePreselection.java | 6 +- .../ReplaceDeterministicCrowding.java | 8 +- .../selection/replacement/ReplaceRandom.java | 8 +- .../selection/replacement/ReplaceWorst.java | 8 +- .../replacement/ReplaceWorstParent.java | 6 +- .../replacement/ReplacementCrowding.java | 10 +- .../terminators/CombinedTerminator.java | 9 +- .../terminators/EvaluationTerminator.java | 7 +- .../FitnessConvergenceTerminator.java | 17 +- .../terminators/FitnessValueTerminator.java | 9 +- .../terminators/GenerationTerminator.java | 9 +- .../PhenotypeConvergenceTerminator.java | 14 +- .../server/go/populations/PBILPopulation.java | 9 +- .../server/go/populations/Population.java | 114 +++++++++--- .../go/problems/AbstractDynTransProblem.java | 13 +- .../AbstractDynamicOptimizationProblem.java | 10 +- .../AbstractMultiModalProblemKnown.java | 20 ++- ...ractMultiObjectiveOptimizationProblem.java | 32 ++-- .../problems/AbstractOptimizationProblem.java | 21 +-- .../AbstractParallelOptimizationProblem.java | 34 ++-- .../go/problems/AbstractProblemBinary.java | 13 +- .../go/problems/AbstractProblemDouble.java | 15 +- ...bstractSynchronousOptimizationProblem.java | 10 +- .../server/go/problems/B1Problem.java | 13 +- .../server/go/problems/BKnapsackProblem.java | 15 +- .../server/go/problems/DynJumpProblem.java | 7 +- .../go/problems/ExternalRuntimeProblem.java | 16 +- .../server/go/problems/F10Problem.java | 4 +- .../server/go/problems/F11Problem.java | 10 +- .../server/go/problems/F12Problem.java | 10 +- .../server/go/problems/F13Problem.java | 10 +- .../server/go/problems/F14Problem.java | 4 +- .../server/go/problems/F1Problem.java | 11 +- .../server/go/problems/F2Problem.java | 4 +- .../server/go/problems/F3Problem.java | 6 +- .../server/go/problems/F4Problem.java | 12 +- .../server/go/problems/F5Problem.java | 12 +- .../server/go/problems/F6Problem.java | 6 +- .../server/go/problems/F7Problem.java | 16 +- .../server/go/problems/F8Problem.java | 10 +- .../server/go/problems/F9Problem.java | 6 +- .../server/go/problems/FLensProblem.java | 58 +++--- .../server/go/problems/FM0Problem.java | 8 +- .../go/problems/Interface2DBorderProblem.java | 2 +- ...InterfaceAdditionalPopulationInformer.java | 4 +- .../InterfaceFirstOrderDerivableProblem.java | 2 +- .../go/problems/InterfaceHasInitRange.java | 2 +- .../go/problems/InterfaceLocalSearchable.java | 6 +- .../InterfaceMultiObjectiveDeNovoProblem.java | 8 +- .../problems/InterfaceMultimodalProblem.java | 2 +- .../InterfaceMultimodalProblemKnown.java | 4 +- .../InterfaceOptimizationObjective.java | 2 +- .../InterfaceOptimizationProblem.java | 11 +- .../problems/InterfaceOptimizationTarget.java | 2 +- .../go/problems/InterfaceProgramProblem.java | 2 +- .../go/problems/MatlabEvalMediator.java | 4 +- .../server/go/problems/MatlabProblem.java | 29 +-- .../go/problems/PSymbolicRegression.java | 101 +++++------ .../go/problems/SimpleProblemWrapper.java | 23 +-- .../server/go/problems/TF1Problem.java | 31 ++-- .../InterfaceRegressionFunction.java | 2 +- .../problems/regression/RFKoza_GPI_10_1.java | 2 +- .../problems/regression/RFKoza_GPI_10_2.java | 2 +- .../problems/regression/RFKoza_GPI_7_3.java | 2 +- .../regression/RFKoza_GPI_7_3_extended.java | 2 +- .../go/problems/regression/RFRaidl_F1.java | 2 +- .../go/problems/regression/RFRaidl_F2.java | 2 +- .../go/problems/regression/RFRaidl_F3.java | 2 +- .../CHCAdaptiveSearchAlgorithm.java | 27 +-- .../go/strategies/ClusterBasedNichingEA.java | 41 ++--- .../go/strategies/ClusteringHillClimbing.java | 21 +-- .../go/strategies/DifferentialEvolution.java | 26 +-- .../DynamicParticleSwarmOptimization.java | 22 +-- .../go/strategies/EvolutionStrategies.java | 22 +-- .../strategies/EvolutionStrategiesEditor.java | 2 +- .../strategies/EvolutionaryProgramming.java | 20 +-- .../server/go/strategies/FloodAlgorithm.java | 14 +- .../go/strategies/GeneticAlgorithm.java | 51 +++--- .../go/strategies/GeneticAlgorithmEditor.java | 2 +- .../strategies/GradientDescentAlgorithm.java | 17 +- .../server/go/strategies/HillClimbing.java | 16 +- .../go/strategies/InterfaceOptimizer.java | 11 +- .../server/go/strategies/IslandModelEA.java | 34 ++-- .../go/strategies/MemeticAlgorithm.java | 19 +- .../go/strategies/MonteCarloSearch.java | 14 +- .../go/strategies/MultiObjectiveEA.java | 22 +-- .../MultiObjectiveMemeticAlgorithmII.java | 24 +-- .../ParticleFilterOptimization.java | 29 +-- .../strategies/ParticleSwarmOptimization.java | 39 ++-- .../PopulationBasedIncrementalLearning.java | 22 +-- .../go/strategies/SimulatedAnnealing.java | 16 +- .../server/go/strategies/SteadyStateGA.java | 22 +-- .../go/strategies/ThresholdAlgorithm.java | 16 +- .../server/go/strategies/Tribes.java | 33 ++-- .../go/strategies/WingedMultiObjectiveEA.java | 28 +-- .../server/go/strategies/tribes/Tribe.java | 8 +- .../go/strategies/tribes/TribesExplorer.java | 16 +- .../go/strategies/tribes/TribesMemory.java | 2 +- .../go/strategies/tribes/TribesParam.java | 2 +- .../go/strategies/tribes/TribesPosition.java | 7 +- .../go/strategies/tribes/TribesSwarm.java | 11 +- .../server/go/tools/AbstractObjectEditor.java | 10 +- .../server/go/tools/DeNovofilter.java | 13 +- .../server/go/tools/FileLoader.java | 2 +- .../server/go/tools/GONamingBox.java | 2 +- .../server/go/tools/GeneralGEOFaker.java | 2 +- .../server/go/tools/GeneralGOEProperty.java | 2 +- .../GeneralGenericObjectEditorPanel.java | 10 +- .../go/tools/ImpactOfDimensionOnMOEAs.java | 23 +-- .../server/go/tools/InterfaceTest.java | 2 +- .../server/go/tools/ModuloTest.java | 2 +- .../go/tools/ParetoFrontLocalTester.java | 9 +- .../server/go/tools/PortfolioFrontTester.java | 9 +- .../go/tools/RandomNumberGenerator.java | 2 +- .../server/go/tools/Test1.java | 2 +- .../server/go/tools/Test2.java | 2 +- .../server/go/tools/Test3.java | 15 +- .../server/go/tools/Test4.java | 2 +- .../server/go/tools/Test5.java | 2 +- .../server/go/tools/TestingDArea.java | 2 +- .../server/go/tools/entity.java | 2 +- .../server/go/tools/point.java | 2 +- .../server/modules/AbstractGOParameters.java | 19 +- .../server/modules/AbstractModuleAdapter.java | 9 +- .../server/modules/DEModuleAdapter.java | 4 +- .../server/modules/DEParameters.java | 29 +-- .../server/modules/EPModuleAdapter.java | 2 +- .../server/modules/EPParameters.java | 25 +-- .../server/modules/GAModuleAdapter.java | 2 +- .../server/modules/GAParameters.java | 27 +-- .../server/modules/GOModuleAdapter.java | 2 +- .../server/modules/GOParameters.java | 17 +- .../server/modules/GenericModuleAdapter.java | 19 +- .../server/modules/HCModuleAdapter.java | 2 +- .../server/modules/HCParameters.java | 23 +-- .../server/modules/MCModuleAdapter.java | 2 +- .../server/modules/MCParameters.java | 25 +-- .../server/modules/MOEAModuleAdapter.java | 17 +- .../server/modules/MOEAParameters.java | 33 ++-- .../server/modules/ModuleAdapter.java | 10 +- .../server/modules/PBILModuleAdapter.java | 2 +- .../server/modules/PBILParameters.java | 21 +-- .../server/modules/PSOModuleAdapter.java | 2 +- .../server/modules/PSOParameters.java | 33 ++-- .../server/modules/Processor.java | 35 ++-- .../server/modules/SAModuleAdapter.java | 2 +- .../server/modules/SAParameters.java | 27 +-- .../server/modules/SSGAModuleAdapter.java | 2 +- .../server/modules/SSGAParameters.java | 27 +-- .../server/stat/AbstractStatistics.java | 13 +- .../server/stat/GenericStatistics.java | 9 +- .../server/stat/InterfaceStatistics.java | 10 +- .../stat/InterfaceStatisticsParameter.java | 5 +- .../server/stat/InterfaceTextListener.java | 2 +- .../server/stat/MovingAverage.java | 2 +- .../server/stat/StatisticsStandalone.java | 9 +- .../server/stat/StatisticsWithGUI.java | 21 +-- .../server/stat/StatsParameter.java | 11 +- src/{javaeva => eva2}/tools/Cluster.java | 2 +- src/{javaeva => eva2}/tools/CubicSpline.java | 2 +- src/{javaeva => eva2}/tools/EVAERROR.java | 28 ++- src/{javaeva => eva2}/tools/EVAHELP.java | 5 +- src/{javaeva => eva2}/tools/EVAThread.java | 2 +- .../tools/JPasswordDialog.java | 2 +- src/{javaeva => eva2}/tools/JarResources.java | 2 +- src/{javaeva => eva2}/tools/KMEANSJAVA.java | 2 +- src/{javaeva => eva2}/tools/LogProxy.java | 2 +- src/{javaeva => eva2}/tools/Mathematics.java | 2 +- .../tools/MultirunRefiner.java | 2 +- src/{javaeva => eva2}/tools/Pair.java | 2 +- .../tools/ReflectPackage.java | 6 +- src/{javaeva => eva2}/tools/SelectedTag.java | 2 +- src/{javaeva => eva2}/tools/Serializer.java | 2 +- .../tools/ServerPingThread.java | 7 +- src/{javaeva => eva2}/tools/StringTools.java | 2 +- .../tools/TXTFileFilter.java | 2 +- src/{javaeva => eva2}/tools/Tag.java | 2 +- src/{javaeva => eva2}/tools/TokenHolder.java | 2 +- src/{javaeva => eva2}/tools/URLGetter.java | 2 +- src/wsi/ra/jproxy/ComAdapter.java | 3 +- src/wsi/ra/jproxy/MainAdapterImpl.java | 5 +- 525 files changed, 3095 insertions(+), 3007 deletions(-) rename resources/{JavaEvA.props => EvA2.props} (83%) delete mode 100644 resources/images/JavaEvA2SplashScreen.png delete mode 100644 resources/images/JavaEvaSplashScreen.png rename resources/images/{JavaEvAIcon.gif => icon1.gif} (100%) rename resources/images/{JavaEvAIcon_2.gif => icon2.gif} (100%) rename resources/images/{JavaEvAIcon_3.gif => icon3.gif} (100%) create mode 100644 resources/images/splashScreen2.png rename src/{javaeva => eva2}/OptimizerFactory.java (92%) rename src/{javaeva => eva2}/OptimizerRunnable.java (84%) rename src/{javaeva => eva2}/client/AppExitAction.java (94%) rename src/{javaeva => eva2}/client/EvAClient.java (91%) rename src/{javaeva => eva2}/client/EvAComAdapter.java (94%) rename src/{javaeva => eva2}/client/RMIConnectionEvA.java (92%) rename src/{javaeva => eva2}/gui/BeanInspector.java (99%) rename src/{javaeva => eva2}/gui/BigStringEditor.java (99%) rename src/{javaeva => eva2}/gui/Chart2DDPointContentSelectable.java (94%) rename src/{javaeva => eva2}/gui/Chart2DDPointIconCircle.java (98%) rename src/{javaeva => eva2}/gui/Chart2DDPointIconContent.java (94%) rename src/{javaeva => eva2}/gui/Chart2DDPointIconCross.java (97%) rename src/{javaeva => eva2}/gui/Chart2DDPointIconPoint.java (98%) rename src/{javaeva => eva2}/gui/Chart2DDPointIconText.java (98%) rename src/{javaeva => eva2}/gui/ComponentFilter.java (96%) rename src/{javaeva => eva2}/gui/DPointSetMultiIcon.java (99%) rename src/{javaeva => eva2}/gui/DataViewer.java (99%) rename src/{javaeva => eva2}/gui/DataViewerInterface.java (96%) rename src/{javaeva => eva2}/gui/Exp.java (98%) rename src/{javaeva => eva2}/gui/ExtAction.java (98%) rename src/{javaeva => eva2}/gui/ExtActionChangedListener.java (97%) rename src/{javaeva => eva2}/gui/ExtDesktopManager.java (99%) rename src/{javaeva => eva2}/gui/FunctionArea.java (99%) rename src/{javaeva => eva2}/gui/GenericAreaEditor.java (96%) rename src/{javaeva => eva2}/gui/GenericArrayEditor.java (99%) rename src/{javaeva => eva2}/gui/GenericDoubleArrayEditor.java (99%) rename src/{javaeva => eva2}/gui/GenericEpsilonConstraintEditor.java (99%) rename src/{javaeva => eva2}/gui/GenericEpsilonThresholdEditor.java (99%) rename src/{javaeva => eva2}/gui/GenericFilePathEditor.java (99%) rename src/{javaeva => eva2}/gui/GenericIntArrayEditor.java (99%) rename src/{javaeva => eva2}/gui/GenericObjectEditor.java (99%) rename src/{javaeva => eva2}/gui/GenericOptimizationObjectivesEditor.java (98%) rename src/{javaeva => eva2}/gui/GenericOptimizationObjectivesWithParamEditor.java (99%) rename src/{javaeva => eva2}/gui/GenericRemoteServersEditor.java (99%) rename src/{javaeva => eva2}/gui/GenericStringListEditor.java (97%) rename src/{javaeva => eva2}/gui/GenericWeigthedLPTchebycheffEditor.java (99%) rename src/{javaeva => eva2}/gui/Graph.java (99%) rename src/{javaeva => eva2}/gui/GraphPointSet.java (99%) rename src/{javaeva => eva2}/gui/GraphWindow.java (99%) rename src/{javaeva => eva2}/gui/HtmlDemo.java (95%) rename src/{javaeva => eva2}/gui/InterfaceDPointWithContent.java (82%) rename src/{javaeva => eva2}/gui/InterfaceSelectablePointIcon.java (88%) rename src/{javaeva => eva2}/gui/JClassTree.java (99%) rename src/{javaeva => eva2}/gui/JDocFrame.java (98%) rename src/{javaeva => eva2}/gui/JEFrame.java (99%) rename src/{javaeva => eva2}/gui/JEFrameRegister.java (98%) rename src/{javaeva => eva2}/gui/JExtDesktopPane.java (97%) rename src/{javaeva => eva2}/gui/JExtFileChooser.java (85%) rename src/{javaeva => eva2}/gui/JExtMenu.java (99%) rename src/{javaeva => eva2}/gui/JExtToolBar.java (99%) rename src/{javaeva => eva2}/gui/JModuleGeneralPanel.java (98%) rename src/{javaeva => eva2}/gui/JParaPanel.java (99%) rename src/{javaeva => eva2}/gui/JTabbedModuleFrame.java (94%) rename src/{javaeva => eva2}/gui/JTextEditorInternalFrame.java (96%) rename src/{javaeva => eva2}/gui/JTextoutputFrame.java (96%) rename src/{javaeva => eva2}/gui/JTextoutputFrameInterface.java (92%) rename src/{javaeva => eva2}/gui/LogPanel.java (95%) rename src/{javaeva => eva2}/gui/Mnemonic.java (97%) rename src/{javaeva => eva2}/gui/MultiLineString.java (95%) rename src/{javaeva => eva2}/gui/MultiLineStringEditor.java (99%) rename src/{javaeva => eva2}/gui/Plot.java (98%) rename src/{javaeva => eva2}/gui/PlotInterface.java (98%) rename src/{javaeva => eva2}/gui/PropertyBoolSelector.java (98%) rename src/{javaeva => eva2}/gui/PropertyDialog.java (92%) rename src/{javaeva => eva2}/gui/PropertyDoubleArray.java (98%) rename src/{javaeva => eva2}/gui/PropertyEditorProvider.java (96%) rename src/{javaeva => eva2}/gui/PropertyEpsilonConstraint.java (97%) rename src/{javaeva => eva2}/gui/PropertyEpsilonThreshold.java (98%) rename src/{javaeva => eva2}/gui/PropertyFilePath.java (98%) rename src/{javaeva => eva2}/gui/PropertyIntArray.java (97%) rename src/{javaeva => eva2}/gui/PropertyOptimizationObjectives.java (97%) rename src/{javaeva => eva2}/gui/PropertyOptimizationObjectivesWithParam.java (98%) rename src/{javaeva => eva2}/gui/PropertyPanel.java (98%) rename src/{javaeva => eva2}/gui/PropertyRemoteServers.java (99%) rename src/{javaeva => eva2}/gui/PropertySheetPanel.java (99%) rename src/{javaeva => eva2}/gui/PropertySheetPanelStat.java (98%) rename src/{javaeva => eva2}/gui/PropertySlider.java (99%) rename src/{javaeva => eva2}/gui/PropertyStringList.java (98%) rename src/{javaeva => eva2}/gui/PropertyText.java (98%) rename src/{javaeva => eva2}/gui/PropertyValueSelector.java (98%) rename src/{javaeva => eva2}/gui/PropertyWeightedLPTchebycheff.java (97%) rename src/{javaeva => eva2}/gui/SerializedObject.java (99%) rename src/{javaeva => eva2}/gui/StatisticsEditor.java (97%) rename src/{javaeva => eva2}/gui/TagEditor.java (94%) rename src/{javaeva => eva2}/gui/TopoPlot.java (98%) rename src/{javaeva => eva2}/gui/TreeElement.java (96%) rename src/{javaeva => eva2}/gui/WindowCloseAction.java (99%) rename src/{javaeva => eva2}/server/EvAMainAdapter.java (93%) rename src/{javaeva => eva2}/server/EvAMainAdapterImpl.java (93%) rename src/{javaeva => eva2}/server/EvAServer.java (94%) rename src/{javaeva => eva2}/server/ModuleServer.java (73%) rename src/{javaeva => eva2}/server/RMIServerEvA.java (96%) rename src/{javaeva => eva2}/server/go/CrossoverInterface.java (91%) rename src/{javaeva => eva2}/server/go/GOStandaloneVersion.java (95%) rename src/{javaeva => eva2}/server/go/IndividualInterface.java (97%) rename src/{javaeva => eva2}/server/go/InterfaceGOParameters.java (90%) rename src/{javaeva => eva2}/server/go/InterfaceGOStandalone.java (90%) rename src/{javaeva => eva2}/server/go/InterfacePopulationChangedEventListener.java (94%) rename src/{javaeva => eva2}/server/go/InterfaceProcessor.java (97%) rename src/{javaeva => eva2}/server/go/InterfaceTerminator.java (97%) rename src/{javaeva => eva2}/server/go/MOCCOStandalone.java (93%) rename src/{javaeva => eva2}/server/go/MutationInterface.java (91%) rename src/{javaeva => eva2}/server/go/PopulationInterface.java (98%) rename src/{javaeva => eva2}/server/go/SelectionInterface.java (91%) rename src/{javaeva => eva2}/server/go/SwingWorker.java (99%) rename src/{javaeva => eva2}/server/go/individuals/AbstractEAIndividual.java (85%) rename src/{javaeva => eva2}/server/go/individuals/AbstractEAIndividualComparator.java (97%) rename src/{javaeva => eva2}/server/go/individuals/ESIndividualBinaryData.java (88%) rename src/{javaeva => eva2}/server/go/individuals/ESIndividualDoubleData.java (89%) rename src/{javaeva => eva2}/server/go/individuals/ESIndividualIntegerData.java (88%) rename src/{javaeva => eva2}/server/go/individuals/ESIndividualPermutationData.java (90%) rename src/{javaeva => eva2}/server/go/individuals/GAESIndividualBinaryDoubleData.java (98%) rename src/{javaeva => eva2}/server/go/individuals/GAIndividualBinaryData.java (84%) rename src/{javaeva => eva2}/server/go/individuals/GAIndividualDoubleData.java (88%) rename src/{javaeva => eva2}/server/go/individuals/GAIndividualIntegerData.java (89%) rename src/{javaeva => eva2}/server/go/individuals/GAPIndividualProgramData.java (94%) rename src/{javaeva => eva2}/server/go/individuals/GEIndividualProgramData.java (94%) rename src/{javaeva => eva2}/server/go/individuals/GIIndividualIntegerData.java (88%) rename src/{javaeva => eva2}/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java (98%) rename src/{javaeva => eva2}/server/go/individuals/GPIndividualProgramData.java (88%) rename src/{javaeva => eva2}/server/go/individuals/InterfaceDataTypeBinary.java (97%) rename src/{javaeva => eva2}/server/go/individuals/InterfaceDataTypeDouble.java (98%) rename src/{javaeva => eva2}/server/go/individuals/InterfaceDataTypeInteger.java (97%) rename src/{javaeva => eva2}/server/go/individuals/InterfaceDataTypePermutation.java (97%) rename src/{javaeva => eva2}/server/go/individuals/InterfaceDataTypeProgram.java (94%) rename src/{javaeva => eva2}/server/go/individuals/InterfaceESIndividual.java (97%) rename src/{javaeva => eva2}/server/go/individuals/InterfaceGAIndividual.java (97%) rename src/{javaeva => eva2}/server/go/individuals/InterfaceGIIndividual.java (98%) rename src/{javaeva => eva2}/server/go/individuals/InterfaceGPIndividual.java (92%) rename src/{javaeva => eva2}/server/go/individuals/InterfaceOBGAIndividual.java (95%) rename src/{javaeva => eva2}/server/go/individuals/OBGAIndividualPermutationData.java (81%) rename src/{javaeva => eva2}/server/go/individuals/codings/ga/GAGrayCodingDouble.java (97%) rename src/{javaeva => eva2}/server/go/individuals/codings/ga/GAGrayCodingInteger.java (98%) rename src/{javaeva => eva2}/server/go/individuals/codings/ga/GAStandardCodingDouble.java (99%) rename src/{javaeva => eva2}/server/go/individuals/codings/ga/GAStandardCodingInteger.java (98%) rename src/{javaeva => eva2}/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java (96%) rename src/{javaeva => eva2}/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java (97%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/AbstractGPNode.java (98%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPArea.java (97%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodeAdd.java (95%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodeCos.java (95%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodeDiv.java (96%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodeExp.java (95%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodeFlowExec2.java (95%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodeFlowExec3.java (95%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodeInput.java (96%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodeMult.java (95%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodeOutput.java (95%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodePow2.java (95%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodePow3.java (95%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodeSin.java (95%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodeSqrt.java (95%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/GPNodeSub.java (96%) rename src/{javaeva => eva2}/server/go/individuals/codings/gp/InterfaceProgram.java (78%) rename src/{javaeva => eva2}/server/go/mocco/InterfaceProcessElement.java (93%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOChooseMOStrategy.java (99%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOChooseReferencePoint.java (94%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOChooseReferenceSolution.java (93%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOInitialPopulationSize.java (94%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOParameterizeGDF.java (93%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOParameterizeMO.java (93%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOParameterizeRefPoint.java (95%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOParameterizeSO.java (92%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOParameterizeSTEP.java (95%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOParameterizeTchebycheff.java (95%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOPhase.java (94%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOProblemInitialization.java (87%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOProblemRedefinition.java (95%) rename src/{javaeva => eva2}/server/go/mocco/MOCCOState.java (93%) rename src/{javaeva => eva2}/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java (88%) rename src/{javaeva => eva2}/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java (88%) rename src/{javaeva => eva2}/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java (79%) rename src/{javaeva => eva2}/server/go/mocco/paretofrontviewer/MOCCOViewer.java (98%) rename src/{javaeva => eva2}/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java (98%) rename src/{javaeva => eva2}/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java (92%) rename src/{javaeva => eva2}/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java (98%) rename src/{javaeva => eva2}/server/go/operators/archiving/AbstractArchiving.java (95%) rename src/{javaeva => eva2}/server/go/operators/archiving/ArchivingAllDominating.java (94%) rename src/{javaeva => eva2}/server/go/operators/archiving/ArchivingMOMAIIAllDominating.java (94%) rename src/{javaeva => eva2}/server/go/operators/archiving/ArchivingMaxiMin.java (95%) rename src/{javaeva => eva2}/server/go/operators/archiving/ArchivingNSGA.java (94%) rename src/{javaeva => eva2}/server/go/operators/archiving/ArchivingNSGAII.java (94%) rename src/{javaeva => eva2}/server/go/operators/archiving/ArchivingPESAII.java (97%) rename src/{javaeva => eva2}/server/go/operators/archiving/ArchivingSPEAII.java (97%) rename src/{javaeva => eva2}/server/go/operators/archiving/InformationRetrievalInserting.java (95%) rename src/{javaeva => eva2}/server/go/operators/archiving/InformationRetrievalNone.java (93%) rename src/{javaeva => eva2}/server/go/operators/archiving/InformationRetrievalReplacing.java (92%) rename src/{javaeva => eva2}/server/go/operators/archiving/InterfaceArchiving.java (88%) rename src/{javaeva => eva2}/server/go/operators/archiving/InterfaceInformationRetrieval.java (87%) rename src/{javaeva => eva2}/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java (87%) rename src/{javaeva => eva2}/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java (95%) rename src/{javaeva => eva2}/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java (92%) rename src/{javaeva => eva2}/server/go/operators/classification/ClassificationSelfOrganizingMaps.java (99%) rename src/{javaeva => eva2}/server/go/operators/classification/InterfaceClassification.java (95%) rename src/{javaeva => eva2}/server/go/operators/cluster/ClusteringDensityBased.java (97%) rename src/{javaeva => eva2}/server/go/operators/cluster/ClusteringKMeans.java (94%) rename src/{javaeva => eva2}/server/go/operators/cluster/ClusteringXMeans.java (95%) rename src/{javaeva => eva2}/server/go/operators/cluster/InterfaceClustering.java (91%) rename src/{javaeva => eva2}/server/go/operators/constraint/ConstBelongsToDifferentClass.java (94%) rename src/{javaeva => eva2}/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java (92%) rename src/{javaeva => eva2}/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java (95%) rename src/{javaeva => eva2}/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java (92%) rename src/{javaeva => eva2}/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java (95%) rename src/{javaeva => eva2}/server/go/operators/constraint/InterfaceConstraint.java (87%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverEAMixer.java (95%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverESArithmetical.java (93%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverESBLXAlpha.java (94%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverESDefault.java (87%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverESFlat.java (93%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverESIntermediate.java (94%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverESNPointDiscrete.java (94%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java (95%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverESPCX.java (96%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverESSBX.java (93%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverESSPX.java (95%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverESUNDX.java (96%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverESUniformDiscrete.java (93%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverGABitSimulated.java (93%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverGADefault.java (92%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverGANPoint.java (94%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverGAUniform.java (93%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverGIDefault.java (94%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverGINPoint.java (94%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverGINPointVL.java (96%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverGIUniform.java (93%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverGPDefault.java (93%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverOBGAPMX.java (89%) rename src/{javaeva => eva2}/server/go/operators/crossover/CrossoverOBGAPMXUniform.java (90%) rename src/{javaeva => eva2}/server/go/operators/crossover/InterfaceCrossover.java (87%) rename src/{javaeva => eva2}/server/go/operators/crossover/NoCrossover.java (93%) rename src/{javaeva => eva2}/server/go/operators/crossover/PropertyCrossoverMixer.java (99%) rename src/{javaeva => eva2}/server/go/operators/crossover/PropertyCrossoverMixerEditor.java (99%) rename src/{javaeva => eva2}/server/go/operators/crossover/TestESCrossover.java (91%) rename src/{javaeva => eva2}/server/go/operators/distancemetric/GenotypeMetricBitSet.java (90%) rename src/{javaeva => eva2}/server/go/operators/distancemetric/InterfaceDistanceMetric.java (89%) rename src/{javaeva => eva2}/server/go/operators/distancemetric/ObjectiveSpaceMetric.java (91%) rename src/{javaeva => eva2}/server/go/operators/distancemetric/PhenotypeMetric.java (94%) rename src/{javaeva => eva2}/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java (92%) rename src/{javaeva => eva2}/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java (91%) rename src/{javaeva => eva2}/server/go/operators/fitnessmodifier/FitnessModifierNone.java (92%) rename src/{javaeva => eva2}/server/go/operators/fitnessmodifier/FitnessSharing.java (92%) rename src/{javaeva => eva2}/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java (85%) rename src/{javaeva => eva2}/server/go/operators/migration/InterfaceMigration.java (93%) rename src/{javaeva => eva2}/server/go/operators/migration/MOBestMigration.java (92%) rename src/{javaeva => eva2}/server/go/operators/migration/MOClusteringSeparation.java (92%) rename src/{javaeva => eva2}/server/go/operators/migration/MOConeSeparation.java (95%) rename src/{javaeva => eva2}/server/go/operators/migration/MOXMeansSeparation.java (93%) rename src/{javaeva => eva2}/server/go/operators/migration/SOBestMigration.java (91%) rename src/{javaeva => eva2}/server/go/operators/migration/SOMONoMigration.java (86%) rename src/{javaeva => eva2}/server/go/operators/moso/InterfaceMOSOConverter.java (92%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSODynamicallyWeightedFitness.java (95%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSOEpsilonConstraint.java (94%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSOEpsilonThreshold.java (95%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSOGoalProgramming.java (95%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSOLpMetric.java (96%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSOMOGARankBased.java (93%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSOMaxiMin.java (94%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSONoConvert.java (92%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSORandomChoice.java (93%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSORandomWeight.java (92%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSORankbased.java (90%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSOUtilityFunction.java (96%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSOWeightedFitness.java (95%) rename src/{javaeva => eva2}/server/go/operators/moso/MOSOWeightedLPTchebycheff.java (96%) rename src/{javaeva => eva2}/server/go/operators/mutation/InterfaceMutation.java (88%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateEAMixer.java (95%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateESCorrolated.java (97%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateESCovarianceMartixAdaption.java (97%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateESDefault.java (90%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateESDerandomized.java (95%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateESFixedStepSize.java (92%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateESGlobal.java (95%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateESLocal.java (95%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateESMainVectorAdaption.java (96%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateESMutativeStepSizeControl.java (94%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateESStandard.java (91%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateESSuccessRule.java (94%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGAAdaptive.java (94%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGADefault.java (90%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGAInvertBits.java (94%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGAStandard.java (92%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGASwapBits.java (92%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGIDefault.java (90%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGIInsertDelete.java (94%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGIInvert.java (92%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGINominal.java (92%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGIOrdinal.java (93%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGITranslocate.java (93%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGPAdaptive.java (93%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGPDefault.java (91%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateGPSingleNode.java (89%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateOBGAFlip.java (87%) rename src/{javaeva => eva2}/server/go/operators/mutation/MutateOBGAInversion.java (87%) rename src/{javaeva => eva2}/server/go/operators/mutation/NoMutation.java (91%) rename src/{javaeva => eva2}/server/go/operators/mutation/PropertyMutationMixer.java (99%) rename src/{javaeva => eva2}/server/go/operators/mutation/PropertyMutationMixerEditor.java (99%) rename src/{javaeva => eva2}/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java (75%) rename src/{javaeva => eva2}/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java (90%) rename src/{javaeva => eva2}/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java (90%) rename src/{javaeva => eva2}/server/go/operators/paretofrontmetrics/MetricErrorRatio.java (92%) rename src/{javaeva => eva2}/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java (90%) rename src/{javaeva => eva2}/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java (87%) rename src/{javaeva => eva2}/server/go/operators/paretofrontmetrics/MetricS.java (95%) rename src/{javaeva => eva2}/server/go/operators/paretofrontmetrics/MetricSWithReference.java (95%) rename src/{javaeva => eva2}/server/go/operators/postprocess/InterfacePostProcessParams.java (94%) rename src/{javaeva => eva2}/server/go/operators/postprocess/PostProcess.java (95%) rename src/{javaeva => eva2}/server/go/operators/postprocess/PostProcessParams.java (96%) rename src/{javaeva => eva2}/server/go/operators/selection/InterfaceSelection.java (93%) rename src/{javaeva => eva2}/server/go/operators/selection/MOMultipleSolutions.java (96%) rename src/{javaeva => eva2}/server/go/operators/selection/MOSolution.java (93%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectAll.java (94%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectBest.java (96%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectBestIndividuals.java (97%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectEPTournaments.java (97%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectHomologousMate.java (91%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectMOMAIIDominanceCounter.java (96%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectMOMaxiMin.java (94%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectMONSGAIICrowedTournament.java (96%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectMONonDominated.java (96%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectMOPESA.java (93%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectMOPESAII.java (95%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectMOSPEAII.java (91%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectParticleWheel.java (92%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectRandom.java (95%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectTournament.java (96%) rename src/{javaeva => eva2}/server/go/operators/selection/SelectXProbRouletteWheel.java (96%) rename src/{javaeva => eva2}/server/go/operators/selection/probability/AbstractSelProb.java (97%) rename src/{javaeva => eva2}/server/go/operators/selection/probability/InterfaceSelectionProbability.java (94%) rename src/{javaeva => eva2}/server/go/operators/selection/probability/SelProbBoltzman.java (98%) rename src/{javaeva => eva2}/server/go/operators/selection/probability/SelProbFitnessSharing.java (93%) rename src/{javaeva => eva2}/server/go/operators/selection/probability/SelProbInvertByMax.java (95%) rename src/{javaeva => eva2}/server/go/operators/selection/probability/SelProbLinearRanking.java (97%) rename src/{javaeva => eva2}/server/go/operators/selection/probability/SelProbNonLinearRanking.java (97%) rename src/{javaeva => eva2}/server/go/operators/selection/probability/SelProbRanking.java (95%) rename src/{javaeva => eva2}/server/go/operators/selection/probability/SelProbStandard.java (96%) rename src/{javaeva => eva2}/server/go/operators/selection/probability/SelProbStandardScaling.java (97%) rename src/{javaeva => eva2}/server/go/operators/selection/replacement/InterfaceReplacement.java (80%) rename src/{javaeva => eva2}/server/go/operators/selection/replacement/PreplacePreselection.java (90%) rename src/{javaeva => eva2}/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java (89%) rename src/{javaeva => eva2}/server/go/operators/selection/replacement/ReplaceRandom.java (86%) rename src/{javaeva => eva2}/server/go/operators/selection/replacement/ReplaceWorst.java (87%) rename src/{javaeva => eva2}/server/go/operators/selection/replacement/ReplaceWorstParent.java (91%) rename src/{javaeva => eva2}/server/go/operators/selection/replacement/ReplacementCrowding.java (89%) rename src/{javaeva => eva2}/server/go/operators/terminators/CombinedTerminator.java (94%) rename src/{javaeva => eva2}/server/go/operators/terminators/EvaluationTerminator.java (94%) rename src/{javaeva => eva2}/server/go/operators/terminators/FitnessConvergenceTerminator.java (94%) rename src/{javaeva => eva2}/server/go/operators/terminators/FitnessValueTerminator.java (91%) rename src/{javaeva => eva2}/server/go/operators/terminators/GenerationTerminator.java (92%) rename src/{javaeva => eva2}/server/go/operators/terminators/PhenotypeConvergenceTerminator.java (81%) rename src/{javaeva => eva2}/server/go/populations/PBILPopulation.java (96%) rename src/{javaeva => eva2}/server/go/populations/Population.java (85%) rename src/{javaeva => eva2}/server/go/problems/AbstractDynTransProblem.java (90%) rename src/{javaeva => eva2}/server/go/problems/AbstractDynamicOptimizationProblem.java (97%) rename src/{javaeva => eva2}/server/go/problems/AbstractMultiModalProblemKnown.java (94%) rename src/{javaeva => eva2}/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java (94%) rename src/{javaeva => eva2}/server/go/problems/AbstractOptimizationProblem.java (92%) rename src/{javaeva => eva2}/server/go/problems/AbstractParallelOptimizationProblem.java (85%) rename src/{javaeva => eva2}/server/go/problems/AbstractProblemBinary.java (90%) rename src/{javaeva => eva2}/server/go/problems/AbstractProblemDouble.java (94%) rename src/{javaeva => eva2}/server/go/problems/AbstractSynchronousOptimizationProblem.java (93%) rename src/{javaeva => eva2}/server/go/problems/B1Problem.java (93%) rename src/{javaeva => eva2}/server/go/problems/BKnapsackProblem.java (97%) rename src/{javaeva => eva2}/server/go/problems/DynJumpProblem.java (94%) rename src/{javaeva => eva2}/server/go/problems/ExternalRuntimeProblem.java (93%) rename src/{javaeva => eva2}/server/go/problems/F10Problem.java (97%) rename src/{javaeva => eva2}/server/go/problems/F11Problem.java (91%) rename src/{javaeva => eva2}/server/go/problems/F12Problem.java (89%) rename src/{javaeva => eva2}/server/go/problems/F13Problem.java (90%) rename src/{javaeva => eva2}/server/go/problems/F14Problem.java (96%) rename src/{javaeva => eva2}/server/go/problems/F1Problem.java (94%) rename src/{javaeva => eva2}/server/go/problems/F2Problem.java (95%) rename src/{javaeva => eva2}/server/go/problems/F3Problem.java (93%) rename src/{javaeva => eva2}/server/go/problems/F4Problem.java (86%) rename src/{javaeva => eva2}/server/go/problems/F5Problem.java (87%) rename src/{javaeva => eva2}/server/go/problems/F6Problem.java (96%) rename src/{javaeva => eva2}/server/go/problems/F7Problem.java (94%) rename src/{javaeva => eva2}/server/go/problems/F8Problem.java (90%) rename src/{javaeva => eva2}/server/go/problems/F9Problem.java (92%) rename src/{javaeva => eva2}/server/go/problems/FLensProblem.java (93%) rename src/{javaeva => eva2}/server/go/problems/FM0Problem.java (93%) rename src/{javaeva => eva2}/server/go/problems/Interface2DBorderProblem.java (94%) rename src/{javaeva => eva2}/server/go/problems/InterfaceAdditionalPopulationInformer.java (86%) rename src/{javaeva => eva2}/server/go/problems/InterfaceFirstOrderDerivableProblem.java (90%) rename src/{javaeva => eva2}/server/go/problems/InterfaceHasInitRange.java (87%) rename src/{javaeva => eva2}/server/go/problems/InterfaceLocalSearchable.java (70%) rename src/{javaeva => eva2}/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java (83%) rename src/{javaeva => eva2}/server/go/problems/InterfaceMultimodalProblem.java (82%) rename src/{javaeva => eva2}/server/go/problems/InterfaceMultimodalProblemKnown.java (94%) rename src/{javaeva => eva2}/server/go/problems/InterfaceOptimizationObjective.java (97%) rename src/{javaeva => eva2}/server/go/problems/InterfaceOptimizationProblem.java (92%) rename src/{javaeva => eva2}/server/go/problems/InterfaceOptimizationTarget.java (91%) rename src/{javaeva => eva2}/server/go/problems/InterfaceProgramProblem.java (95%) rename src/{javaeva => eva2}/server/go/problems/MatlabEvalMediator.java (98%) rename src/{javaeva => eva2}/server/go/problems/MatlabProblem.java (94%) rename src/{javaeva => eva2}/server/go/problems/PSymbolicRegression.java (83%) rename src/{javaeva => eva2}/server/go/problems/SimpleProblemWrapper.java (91%) rename src/{javaeva => eva2}/server/go/problems/TF1Problem.java (95%) rename src/{javaeva => eva2}/server/go/problems/regression/InterfaceRegressionFunction.java (91%) rename src/{javaeva => eva2}/server/go/problems/regression/RFKoza_GPI_10_1.java (96%) rename src/{javaeva => eva2}/server/go/problems/regression/RFKoza_GPI_10_2.java (96%) rename src/{javaeva => eva2}/server/go/problems/regression/RFKoza_GPI_7_3.java (96%) rename src/{javaeva => eva2}/server/go/problems/regression/RFKoza_GPI_7_3_extended.java (96%) rename src/{javaeva => eva2}/server/go/problems/regression/RFRaidl_F1.java (96%) rename src/{javaeva => eva2}/server/go/problems/regression/RFRaidl_F2.java (96%) rename src/{javaeva => eva2}/server/go/problems/regression/RFRaidl_F3.java (96%) rename src/{javaeva => eva2}/server/go/strategies/CHCAdaptiveSearchAlgorithm.java (94%) rename src/{javaeva => eva2}/server/go/strategies/ClusterBasedNichingEA.java (97%) rename src/{javaeva => eva2}/server/go/strategies/ClusteringHillClimbing.java (95%) rename src/{javaeva => eva2}/server/go/strategies/DifferentialEvolution.java (96%) rename src/{javaeva => eva2}/server/go/strategies/DynamicParticleSwarmOptimization.java (97%) rename src/{javaeva => eva2}/server/go/strategies/EvolutionStrategies.java (97%) rename src/{javaeva => eva2}/server/go/strategies/EvolutionStrategiesEditor.java (99%) rename src/{javaeva => eva2}/server/go/strategies/EvolutionaryProgramming.java (93%) rename src/{javaeva => eva2}/server/go/strategies/FloodAlgorithm.java (96%) rename src/{javaeva => eva2}/server/go/strategies/GeneticAlgorithm.java (90%) rename src/{javaeva => eva2}/server/go/strategies/GeneticAlgorithmEditor.java (99%) rename src/{javaeva => eva2}/server/go/strategies/GradientDescentAlgorithm.java (96%) rename src/{javaeva => eva2}/server/go/strategies/HillClimbing.java (95%) rename src/{javaeva => eva2}/server/go/strategies/InterfaceOptimizer.java (91%) rename src/{javaeva => eva2}/server/go/strategies/IslandModelEA.java (95%) rename src/{javaeva => eva2}/server/go/strategies/MemeticAlgorithm.java (95%) rename src/{javaeva => eva2}/server/go/strategies/MonteCarloSearch.java (95%) rename src/{javaeva => eva2}/server/go/strategies/MultiObjectiveEA.java (94%) rename src/{javaeva => eva2}/server/go/strategies/MultiObjectiveMemeticAlgorithmII.java (91%) rename src/{javaeva => eva2}/server/go/strategies/ParticleFilterOptimization.java (93%) rename src/{javaeva => eva2}/server/go/strategies/ParticleSwarmOptimization.java (98%) rename src/{javaeva => eva2}/server/go/strategies/PopulationBasedIncrementalLearning.java (94%) rename src/{javaeva => eva2}/server/go/strategies/SimulatedAnnealing.java (95%) rename src/{javaeva => eva2}/server/go/strategies/SteadyStateGA.java (93%) rename src/{javaeva => eva2}/server/go/strategies/ThresholdAlgorithm.java (95%) rename src/{javaeva => eva2}/server/go/strategies/Tribes.java (96%) rename src/{javaeva => eva2}/server/go/strategies/WingedMultiObjectiveEA.java (93%) rename src/{javaeva => eva2}/server/go/strategies/tribes/Tribe.java (97%) rename src/{javaeva => eva2}/server/go/strategies/tribes/TribesExplorer.java (98%) rename src/{javaeva => eva2}/server/go/strategies/tribes/TribesMemory.java (98%) rename src/{javaeva => eva2}/server/go/strategies/tribes/TribesParam.java (95%) rename src/{javaeva => eva2}/server/go/strategies/tribes/TribesPosition.java (99%) rename src/{javaeva => eva2}/server/go/strategies/tribes/TribesSwarm.java (99%) rename src/{javaeva => eva2}/server/go/tools/AbstractObjectEditor.java (99%) rename src/{javaeva => eva2}/server/go/tools/DeNovofilter.java (87%) rename src/{javaeva => eva2}/server/go/tools/FileLoader.java (98%) rename src/{javaeva => eva2}/server/go/tools/GONamingBox.java (98%) rename src/{javaeva => eva2}/server/go/tools/GeneralGEOFaker.java (99%) rename src/{javaeva => eva2}/server/go/tools/GeneralGOEProperty.java (95%) rename src/{javaeva => eva2}/server/go/tools/GeneralGenericObjectEditorPanel.java (98%) rename src/{javaeva => eva2}/server/go/tools/ImpactOfDimensionOnMOEAs.java (87%) rename src/{javaeva => eva2}/server/go/tools/InterfaceTest.java (84%) rename src/{javaeva => eva2}/server/go/tools/ModuloTest.java (94%) rename src/{javaeva => eva2}/server/go/tools/ParetoFrontLocalTester.java (95%) rename src/{javaeva => eva2}/server/go/tools/PortfolioFrontTester.java (98%) rename src/{javaeva => eva2}/server/go/tools/RandomNumberGenerator.java (99%) rename src/{javaeva => eva2}/server/go/tools/Test1.java (96%) rename src/{javaeva => eva2}/server/go/tools/Test2.java (97%) rename src/{javaeva => eva2}/server/go/tools/Test3.java (87%) rename src/{javaeva => eva2}/server/go/tools/Test4.java (95%) rename src/{javaeva => eva2}/server/go/tools/Test5.java (98%) rename src/{javaeva => eva2}/server/go/tools/TestingDArea.java (97%) rename src/{javaeva => eva2}/server/go/tools/entity.java (96%) rename src/{javaeva => eva2}/server/go/tools/point.java (96%) rename src/{javaeva => eva2}/server/modules/AbstractGOParameters.java (92%) rename src/{javaeva => eva2}/server/modules/AbstractModuleAdapter.java (97%) rename src/{javaeva => eva2}/server/modules/DEModuleAdapter.java (91%) rename src/{javaeva => eva2}/server/modules/DEParameters.java (84%) rename src/{javaeva => eva2}/server/modules/EPModuleAdapter.java (96%) rename src/{javaeva => eva2}/server/modules/EPParameters.java (82%) rename src/{javaeva => eva2}/server/modules/GAModuleAdapter.java (96%) rename src/{javaeva => eva2}/server/modules/GAParameters.java (87%) rename src/{javaeva => eva2}/server/modules/GOModuleAdapter.java (96%) rename src/{javaeva => eva2}/server/modules/GOParameters.java (81%) rename src/{javaeva => eva2}/server/modules/GenericModuleAdapter.java (89%) rename src/{javaeva => eva2}/server/modules/HCModuleAdapter.java (96%) rename src/{javaeva => eva2}/server/modules/HCParameters.java (79%) rename src/{javaeva => eva2}/server/modules/MCModuleAdapter.java (96%) rename src/{javaeva => eva2}/server/modules/MCParameters.java (77%) rename src/{javaeva => eva2}/server/modules/MOEAModuleAdapter.java (76%) rename src/{javaeva => eva2}/server/modules/MOEAParameters.java (84%) rename src/{javaeva => eva2}/server/modules/ModuleAdapter.java (88%) rename src/{javaeva => eva2}/server/modules/PBILModuleAdapter.java (96%) rename src/{javaeva => eva2}/server/modules/PBILParameters.java (90%) rename src/{javaeva => eva2}/server/modules/PSOModuleAdapter.java (96%) rename src/{javaeva => eva2}/server/modules/PSOParameters.java (91%) rename src/{javaeva => eva2}/server/modules/Processor.java (92%) rename src/{javaeva => eva2}/server/modules/SAModuleAdapter.java (96%) rename src/{javaeva => eva2}/server/modules/SAParameters.java (84%) rename src/{javaeva => eva2}/server/modules/SSGAModuleAdapter.java (96%) rename src/{javaeva => eva2}/server/modules/SSGAParameters.java (86%) rename src/{javaeva => eva2}/server/stat/AbstractStatistics.java (98%) rename src/{javaeva => eva2}/server/stat/GenericStatistics.java (97%) rename src/{javaeva => eva2}/server/stat/InterfaceStatistics.java (87%) rename src/{javaeva => eva2}/server/stat/InterfaceStatisticsParameter.java (97%) rename src/{javaeva => eva2}/server/stat/InterfaceTextListener.java (79%) rename src/{javaeva => eva2}/server/stat/MovingAverage.java (98%) rename src/{javaeva => eva2}/server/stat/StatisticsStandalone.java (97%) rename src/{javaeva => eva2}/server/stat/StatisticsWithGUI.java (96%) rename src/{javaeva => eva2}/server/stat/StatsParameter.java (98%) rename src/{javaeva => eva2}/tools/Cluster.java (98%) rename src/{javaeva => eva2}/tools/CubicSpline.java (99%) rename src/{javaeva => eva2}/tools/EVAERROR.java (71%) rename src/{javaeva => eva2}/tools/EVAHELP.java (98%) rename src/{javaeva => eva2}/tools/EVAThread.java (99%) rename src/{javaeva => eva2}/tools/JPasswordDialog.java (99%) rename src/{javaeva => eva2}/tools/JarResources.java (99%) rename src/{javaeva => eva2}/tools/KMEANSJAVA.java (99%) rename src/{javaeva => eva2}/tools/LogProxy.java (99%) rename src/{javaeva => eva2}/tools/Mathematics.java (99%) rename src/{javaeva => eva2}/tools/MultirunRefiner.java (99%) rename src/{javaeva => eva2}/tools/Pair.java (94%) rename src/{javaeva => eva2}/tools/ReflectPackage.java (98%) rename src/{javaeva => eva2}/tools/SelectedTag.java (99%) rename src/{javaeva => eva2}/tools/Serializer.java (99%) rename src/{javaeva => eva2}/tools/ServerPingThread.java (93%) rename src/{javaeva => eva2}/tools/StringTools.java (98%) rename src/{javaeva => eva2}/tools/TXTFileFilter.java (97%) rename src/{javaeva => eva2}/tools/Tag.java (97%) rename src/{javaeva => eva2}/tools/TokenHolder.java (99%) rename src/{javaeva => eva2}/tools/URLGetter.java (98%) diff --git a/resources/JavaEvA.props b/resources/EvA2.props similarity index 83% rename from resources/JavaEvA.props rename to resources/EvA2.props index bbbcb291..9b954cbd 100644 --- a/resources/JavaEvA.props +++ b/resources/EvA2.props @@ -12,7 +12,7 @@ ServerList = localhost,134.2.172.14,ranode22 #################### Internals: Do not alter! # base class for modules. Do not alter! -ModulePackage = javaeva.server.modules +ModulePackage = eva2.server.modules # filter class for modules. Do not alter! -ModuleFilterClass = javaeva.server.modules.AbstractModuleAdapter +ModuleFilterClass = eva2.server.modules.AbstractModuleAdapter diff --git a/resources/images/JavaEvA2SplashScreen.png b/resources/images/JavaEvA2SplashScreen.png deleted file mode 100644 index 6e61ec7e6c65db54bdead04d4759655ecc95c395..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43359 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 z 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 diff --git a/resources/images/JavaEvaSplashScreen.png b/resources/images/JavaEvaSplashScreen.png deleted file mode 100644 index 76ef87c80eede5667e03fa9a5eb1fe7ee884daa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26655 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 RE+F7XOI=T`R>d~*KLAtnhL!*T diff --git a/resources/images/JavaEvAIcon.gif b/resources/images/icon1.gif similarity index 100% rename from resources/images/JavaEvAIcon.gif rename to resources/images/icon1.gif diff --git a/resources/images/JavaEvAIcon_2.gif b/resources/images/icon2.gif similarity index 100% rename from resources/images/JavaEvAIcon_2.gif rename to resources/images/icon2.gif diff --git a/resources/images/JavaEvAIcon_3.gif b/resources/images/icon3.gif similarity index 100% rename from resources/images/JavaEvAIcon_3.gif rename to resources/images/icon3.gif diff --git a/resources/images/splashScreen2.png b/resources/images/splashScreen2.png new file mode 100644 index 0000000000000000000000000000000000000000..772be1d54d73104ce7263f1a9bb6a8603730066b GIT binary patch literal 42014 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�!2&wZKry9ZCas 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 literal 0 HcmV?d00001 diff --git a/src/javaeva/OptimizerFactory.java b/src/eva2/OptimizerFactory.java similarity index 92% rename from src/javaeva/OptimizerFactory.java rename to src/eva2/OptimizerFactory.java index b6c2ee5d..466af6a9 100644 --- a/src/javaeva/OptimizerFactory.java +++ b/src/eva2/OptimizerFactory.java @@ -1,48 +1,49 @@ /* * Copyright (c) ZBiT, University of Tübingen, Germany */ -package javaeva; +package eva2; import java.util.BitSet; import java.util.Vector; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeBinary; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.operators.cluster.ClusteringDensityBased; -import javaeva.server.go.operators.crossover.CrossoverESDefault; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.operators.crossover.NoCrossover; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESCovarianceMartixAdaption; -import javaeva.server.go.operators.mutation.MutateESFixedStepSize; -import javaeva.server.go.operators.mutation.MutateESGlobal; -import javaeva.server.go.operators.mutation.NoMutation; -import javaeva.server.go.operators.postprocess.InterfacePostProcessParams; -import javaeva.server.go.operators.postprocess.PostProcessParams; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.terminators.CombinedTerminator; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.operators.terminators.FitnessConvergenceTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.strategies.ClusterBasedNichingEA; -import javaeva.server.go.strategies.ClusteringHillClimbing; -import javaeva.server.go.strategies.DifferentialEvolution; -import javaeva.server.go.strategies.EvolutionStrategies; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.GradientDescentAlgorithm; -import javaeva.server.go.strategies.HillClimbing; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MonteCarloSearch; -import javaeva.server.go.strategies.ParticleSwarmOptimization; -import javaeva.server.go.strategies.SimulatedAnnealing; -import javaeva.server.go.strategies.Tribes; -import javaeva.server.modules.GOParameters; +import eva2.server.go.IndividualInterface; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeBinary; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.operators.cluster.ClusteringDensityBased; +import eva2.server.go.operators.crossover.CrossoverESDefault; +import eva2.server.go.operators.crossover.InterfaceCrossover; +import eva2.server.go.operators.crossover.NoCrossover; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateESCovarianceMartixAdaption; +import eva2.server.go.operators.mutation.MutateESFixedStepSize; +import eva2.server.go.operators.mutation.MutateESGlobal; +import eva2.server.go.operators.mutation.NoMutation; +import eva2.server.go.operators.postprocess.InterfacePostProcessParams; +import eva2.server.go.operators.postprocess.PostProcessParams; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.terminators.CombinedTerminator; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.operators.terminators.FitnessConvergenceTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractOptimizationProblem; +import eva2.server.go.strategies.ClusterBasedNichingEA; +import eva2.server.go.strategies.ClusteringHillClimbing; +import eva2.server.go.strategies.DifferentialEvolution; +import eva2.server.go.strategies.EvolutionStrategies; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.GradientDescentAlgorithm; +import eva2.server.go.strategies.HillClimbing; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.MonteCarloSearch; +import eva2.server.go.strategies.ParticleSwarmOptimization; +import eva2.server.go.strategies.SimulatedAnnealing; +import eva2.server.go.strategies.Tribes; +import eva2.server.modules.GOParameters; + /** *

diff --git a/src/javaeva/OptimizerRunnable.java b/src/eva2/OptimizerRunnable.java similarity index 84% rename from src/javaeva/OptimizerRunnable.java rename to src/eva2/OptimizerRunnable.java index aad3606b..55e5d809 100644 --- a/src/javaeva/OptimizerRunnable.java +++ b/src/eva2/OptimizerRunnable.java @@ -1,23 +1,24 @@ -package javaeva; +package eva2; import java.io.PrintWriter; import java.io.StringWriter; import java.util.BitSet; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.InterfaceDataTypeBinary; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceDataTypeInteger; -import javaeva.server.go.operators.postprocess.InterfacePostProcessParams; -import javaeva.server.go.operators.postprocess.PostProcessParams; -import javaeva.server.go.populations.Population; -import javaeva.server.modules.GOParameters; -import javaeva.server.modules.Processor; -import javaeva.server.stat.AbstractStatistics; -import javaeva.server.stat.InterfaceTextListener; -import javaeva.server.stat.StatisticsStandalone; +import eva2.server.go.IndividualInterface; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.individuals.InterfaceDataTypeBinary; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.InterfaceDataTypeInteger; +import eva2.server.go.operators.postprocess.InterfacePostProcessParams; +import eva2.server.go.operators.postprocess.PostProcessParams; +import eva2.server.go.populations.Population; +import eva2.server.modules.GOParameters; +import eva2.server.modules.Processor; +import eva2.server.stat.AbstractStatistics; +import eva2.server.stat.InterfaceTextListener; +import eva2.server.stat.StatisticsStandalone; + /** * This Runnable class just encapsulates the Processor class with some simple ways to access a solution. diff --git a/src/javaeva/client/AppExitAction.java b/src/eva2/client/AppExitAction.java similarity index 94% rename from src/javaeva/client/AppExitAction.java rename to src/eva2/client/AppExitAction.java index cb142afc..68f16f75 100644 --- a/src/javaeva/client/AppExitAction.java +++ b/src/eva2/client/AppExitAction.java @@ -1,8 +1,10 @@ -package javaeva.client; +package eva2.client; -import javaeva.gui.ExtAction; import javax.swing.*; + +import eva2.gui.ExtAction; + import java.awt.event.WindowListener; import java.awt.event.ActionEvent; import java.awt.event.WindowEvent; diff --git a/src/javaeva/client/EvAClient.java b/src/eva2/client/EvAClient.java similarity index 91% rename from src/javaeva/client/EvAClient.java rename to src/eva2/client/EvAClient.java index 55890077..8465d96e 100644 --- a/src/javaeva/client/EvAClient.java +++ b/src/eva2/client/EvAClient.java @@ -1,7 +1,7 @@ -package javaeva.client; +package eva2.client; /* - * Title: JavaEvA + * Title: EvA2 * Description: * Copyright: Copyright (c) 2003 * Company: University of Tuebingen, Computer Architecture @@ -28,18 +28,6 @@ import java.net.URL; import java.util.Properties; import java.util.Set; -import javaeva.gui.ExtAction; -import javaeva.gui.JEFrame; -import javaeva.gui.JEFrameRegister; -import javaeva.gui.JExtMenu; -import javaeva.gui.JTabbedModuleFrame; -import javaeva.gui.LogPanel; -import javaeva.server.EvAServer; -import javaeva.server.modules.ModuleAdapter; -import javaeva.tools.EVAERROR; -import javaeva.tools.EVAHELP; -import javaeva.tools.ReflectPackage; -import javaeva.tools.Serializer; import javax.swing.ButtonGroup; import javax.swing.ImageIcon; @@ -59,6 +47,19 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.event.MenuEvent; import javax.swing.event.MenuListener; +import eva2.gui.ExtAction; +import eva2.gui.JEFrame; +import eva2.gui.JEFrameRegister; +import eva2.gui.JExtMenu; +import eva2.gui.JTabbedModuleFrame; +import eva2.gui.LogPanel; +import eva2.server.EvAServer; +import eva2.server.modules.ModuleAdapter; +import eva2.tools.EVAERROR; +import eva2.tools.EVAHELP; +import eva2.tools.ReflectPackage; +import eva2.tools.Serializer; + import wsi.ra.jproxy.RemoteStateListener; import wsi.ra.tool.BasicResourceLoader; @@ -73,15 +74,14 @@ import wsi.ra.tool.BasicResourceLoader; * */ public class EvAClient implements RemoteStateListener, Serializable { - public static final String EVA_PROPERTY_FILE = "resources/JavaEvA.props"; + public static final String EVA_PROPERTY_FILE = "resources/EvA2.props"; private static Properties EVA_PROPERTIES; - public static final String iconLocation = "resources/images/JavaEvAIcon_3.gif"; - private static final String splashLocation = "resources/images/JavaEvA2SplashScreen.png"; -// private static final String splashLocation = "resources/images/JavaEvA2SplashScreen.jpg"; + public static final String iconLocation = "resources/images/icon3.gif"; + private static final String splashLocation = "resources/images/splashScreen2.png"; final int splashScreenTime = 1500; public static boolean TRACE = false; - private static String m_ProductName = "JavaEvA 2"; + private static String m_ProductName = "EvA 2"; // private int PREFERRED_WIDTH = 680; // private int PREFERRED_HEIGHT = 550; public JEFrame m_Frame; @@ -155,8 +155,8 @@ public class EvAClient implements RemoteStateListener, Serializable { } /** - * Constructor of GUI of JavaEva. - * Works as client for the JavaEva server. + * Constructor of GUI of EvA2. + * Works as client for the EvA2 server. * */ public EvAClient(final String hostName) { @@ -202,9 +202,9 @@ public class EvAClient implements RemoteStateListener, Serializable { try { m_Frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!"); } - m_Frame.setTitle("JavaEvA workbench"); + m_Frame.setTitle("EvA2 workbench"); try { Thread.sleep(200); @@ -231,7 +231,7 @@ public class EvAClient implements RemoteStateListener, Serializable { m_Frame.addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) { - System.out.println("Closing JavaEvA Client. Bye!"); + System.out.println("Closing EvA2 Client. Bye!"); m_Frame.dispose(); Set keys = System.getenv().keySet(); if (keys.contains("MATLAB")) { @@ -256,27 +256,6 @@ public class EvAClient implements RemoteStateListener, Serializable { m_Frame.setVisible(true); } } -// -// /** -// * Create the JavaEvA splash screen. -// */ -// public void createSplashScreen() { -// BasicResourceLoader loader = BasicResourceLoader.instance(); -// byte[] bytes = loader.getBytesFromResourceLocation("resources/images/JavaEvA2SplashScreen.jpg"); -// try { -// ImageIcon ii = new ImageIcon(Toolkit.getDefaultToolkit().createImage(bytes)); -// JLabel splashLabel = new JLabel(ii); -// m_splashScreen = new JWindow(); -// m_splashScreen.getContentPane().add(splashLabel); -// m_splashScreen.pack(); -// Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); -// //splashScreen.setSize(screenSize); -// m_splashScreen.setLocation(screenSize.width / 2 - m_splashScreen.getSize().width / 2, screenSize.height / 2 - m_splashScreen.getSize().height / 2); -// } catch (java.lang.NullPointerException e) { -// System.err.println("Could not find JavaEvA splash screen, please move rescoure folder to working directory!"); -// } -// -// } /** * The one and only main of the client program. @@ -531,7 +510,7 @@ public class EvAClient implements RemoteStateListener, Serializable { if (selectedModule == null) { // show a dialog and ask for a module String[] ModuleNameList = m_ComAdapter.getModuleNameList(); if (ModuleNameList == null) { - JOptionPane.showMessageDialog(m_Frame.getContentPane(), "No modules available on " + m_ComAdapter.getHostName(), "JavaEvA Information", 1); + JOptionPane.showMessageDialog(m_Frame.getContentPane(), "No modules available on " + m_ComAdapter.getHostName(), "EvA2 Information", 1); } else { String LastModuleName = Serializer.loadString("lastmodule.ser"); if (LastModuleName == null) LastModuleName = ModuleNameList[0]; @@ -664,7 +643,7 @@ public class EvAClient implements RemoteStateListener, Serializable { } private void showPleaseWaitDialog() { - JOptionPane.showMessageDialog(m_Frame.getContentPane(), "Please wait one moment.", "JavaEvA Information", 1); + JOptionPane.showMessageDialog(m_Frame.getContentPane(), "Please wait one moment.", "EvA2 Information", 1); } private void showAboutDialog() { @@ -672,11 +651,11 @@ public class EvAClient implements RemoteStateListener, Serializable { (m_Frame, m_ProductName + "\n University of Tuebingen\n Computer Architecture\n H. Ulmer & F. Streichert & H. Planatscher & M. de Paly & M. Kronfeld\n Prof. Dr. Andreas Zell \n (c) 2008 \n Version " + - EvAServer.Version + " \n http://www.ra.cs.uni-tuebingen.de/software/JavaEvA", "JavaEvA Information", 1); + EvAServer.Version + " \n http://www.ra.cs.uni-tuebingen.de/software/EvA2", "EvA2 Information", 1); } private void showNoHostFoundDialog() { - JOptionPane.showMessageDialog(m_Frame.getContentPane(), "No host with running EVASERVER found. Please start one or \nadd the correct address to the properties list.", "JavaEvA Information", 1); + JOptionPane.showMessageDialog(m_Frame.getContentPane(), "No host with running EVASERVER found. Please start one or \nadd the correct address to the properties list.", "EvA2 Information", 1); } /** @@ -779,7 +758,7 @@ final class SplashScreen extends Frame { splashWindow.setLocation(screenSize.width / 2 - splashWindow.getSize().width / 2, screenSize.height / 2 - splashWindow.getSize().height / 2); splashWindow.setVisible(true); } catch (java.lang.NullPointerException e) { - System.err.println("Could not find JavaEvA splash screen, please move rescoure folder to working directory!"); + System.err.println("Could not find EvA2 splash screen, please move rescoure folder to working directory!"); } } diff --git a/src/javaeva/client/EvAComAdapter.java b/src/eva2/client/EvAComAdapter.java similarity index 94% rename from src/javaeva/client/EvAComAdapter.java rename to src/eva2/client/EvAComAdapter.java index e8087972..e60d837b 100644 --- a/src/javaeva/client/EvAComAdapter.java +++ b/src/eva2/client/EvAComAdapter.java @@ -1,7 +1,7 @@ -package javaeva.client; +package eva2.client; /* - * Title: JavaEvA + * Title: EvA2 * Description: * Copyright: Copyright (c) 2003 * Company: University of Tuebingen, Computer Architecture @@ -17,11 +17,12 @@ package javaeva.client; import java.rmi.RemoteException; import java.rmi.registry.Registry; import java.util.ArrayList; -import javaeva.gui.LogPanel; -import javaeva.server.EvAMainAdapter; -import javaeva.server.EvAMainAdapterImpl; -import javaeva.server.RMIServerEvA; -import javaeva.server.modules.ModuleAdapter; + +import eva2.gui.LogPanel; +import eva2.server.EvAMainAdapter; +import eva2.server.EvAMainAdapterImpl; +import eva2.server.RMIServerEvA; +import eva2.server.modules.ModuleAdapter; import wsi.ra.jproxy.ComAdapter; import wsi.ra.jproxy.MainAdapter; diff --git a/src/javaeva/client/RMIConnectionEvA.java b/src/eva2/client/RMIConnectionEvA.java similarity index 92% rename from src/javaeva/client/RMIConnectionEvA.java rename to src/eva2/client/RMIConnectionEvA.java index 5a547e5b..0b295a0a 100644 --- a/src/javaeva/client/RMIConnectionEvA.java +++ b/src/eva2/client/RMIConnectionEvA.java @@ -1,10 +1,11 @@ -package javaeva.client; +package eva2.client; import java.net.InetAddress; import java.net.UnknownHostException; -import javaeva.server.EvAMainAdapter; -import javaeva.server.modules.ModuleAdapter; +import eva2.server.EvAMainAdapter; +import eva2.server.modules.ModuleAdapter; + import wsi.ra.jproxy.MainAdapter; import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.RMIConnection; diff --git a/src/javaeva/gui/BeanInspector.java b/src/eva2/gui/BeanInspector.java similarity index 99% rename from src/javaeva/gui/BeanInspector.java rename to src/eva2/gui/BeanInspector.java index 825f1705..3d5cbdf9 100644 --- a/src/javaeva/gui/BeanInspector.java +++ b/src/eva2/gui/BeanInspector.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -21,9 +21,10 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import javaeva.server.go.populations.Population; -import javaeva.tools.SelectedTag; -import javaeva.tools.Tag; +import eva2.server.go.populations.Population; +import eva2.tools.SelectedTag; +import eva2.tools.Tag; + /* * ==========================================================================* diff --git a/src/javaeva/gui/BigStringEditor.java b/src/eva2/gui/BigStringEditor.java similarity index 99% rename from src/javaeva/gui/BigStringEditor.java rename to src/eva2/gui/BigStringEditor.java index 43fd7430..1d8bd700 100644 --- a/src/javaeva/gui/BigStringEditor.java +++ b/src/eva2/gui/BigStringEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/Chart2DDPointContentSelectable.java b/src/eva2/gui/Chart2DDPointContentSelectable.java similarity index 94% rename from src/javaeva/gui/Chart2DDPointContentSelectable.java rename to src/eva2/gui/Chart2DDPointContentSelectable.java index 55b0f412..9ec0838d 100644 --- a/src/javaeva/gui/Chart2DDPointContentSelectable.java +++ b/src/eva2/gui/Chart2DDPointContentSelectable.java @@ -1,12 +1,14 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DBorder; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; -import javaeva.server.go.problems.InterfaceOptimizationProblem; import javax.swing.*; + +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; diff --git a/src/javaeva/gui/Chart2DDPointIconCircle.java b/src/eva2/gui/Chart2DDPointIconCircle.java similarity index 98% rename from src/javaeva/gui/Chart2DDPointIconCircle.java rename to src/eva2/gui/Chart2DDPointIconCircle.java index 279dbc84..879ab561 100644 --- a/src/javaeva/gui/Chart2DDPointIconCircle.java +++ b/src/eva2/gui/Chart2DDPointIconCircle.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DBorder; diff --git a/src/javaeva/gui/Chart2DDPointIconContent.java b/src/eva2/gui/Chart2DDPointIconContent.java similarity index 94% rename from src/javaeva/gui/Chart2DDPointIconContent.java rename to src/eva2/gui/Chart2DDPointIconContent.java index a9ac9d97..cf813268 100644 --- a/src/javaeva/gui/Chart2DDPointIconContent.java +++ b/src/eva2/gui/Chart2DDPointIconContent.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.DBorder; import wsi.ra.chart2d.DPointIcon; @@ -7,11 +7,12 @@ import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.problems.InterfaceOptimizationProblem; import javax.swing.*; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.problems.InterfaceOptimizationProblem; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/gui/Chart2DDPointIconCross.java b/src/eva2/gui/Chart2DDPointIconCross.java similarity index 97% rename from src/javaeva/gui/Chart2DDPointIconCross.java rename to src/eva2/gui/Chart2DDPointIconCross.java index 5ef211fd..97b85ef6 100644 --- a/src/javaeva/gui/Chart2DDPointIconCross.java +++ b/src/eva2/gui/Chart2DDPointIconCross.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.DBorder; import wsi.ra.chart2d.DPointIcon; diff --git a/src/javaeva/gui/Chart2DDPointIconPoint.java b/src/eva2/gui/Chart2DDPointIconPoint.java similarity index 98% rename from src/javaeva/gui/Chart2DDPointIconPoint.java rename to src/eva2/gui/Chart2DDPointIconPoint.java index 6be2683c..eb461f10 100644 --- a/src/javaeva/gui/Chart2DDPointIconPoint.java +++ b/src/eva2/gui/Chart2DDPointIconPoint.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DBorder; diff --git a/src/javaeva/gui/Chart2DDPointIconText.java b/src/eva2/gui/Chart2DDPointIconText.java similarity index 98% rename from src/javaeva/gui/Chart2DDPointIconText.java rename to src/eva2/gui/Chart2DDPointIconText.java index 0777aa3e..b9a4123b 100644 --- a/src/javaeva/gui/Chart2DDPointIconText.java +++ b/src/eva2/gui/Chart2DDPointIconText.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DBorder; diff --git a/src/javaeva/gui/ComponentFilter.java b/src/eva2/gui/ComponentFilter.java similarity index 96% rename from src/javaeva/gui/ComponentFilter.java rename to src/eva2/gui/ComponentFilter.java index 545039c9..0e22ad2a 100644 --- a/src/javaeva/gui/ComponentFilter.java +++ b/src/eva2/gui/ComponentFilter.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/DPointSetMultiIcon.java b/src/eva2/gui/DPointSetMultiIcon.java similarity index 99% rename from src/javaeva/gui/DPointSetMultiIcon.java rename to src/eva2/gui/DPointSetMultiIcon.java index d51bfe9f..89629e66 100644 --- a/src/javaeva/gui/DPointSetMultiIcon.java +++ b/src/eva2/gui/DPointSetMultiIcon.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.*; diff --git a/src/javaeva/gui/DataViewer.java b/src/eva2/gui/DataViewer.java similarity index 99% rename from src/javaeva/gui/DataViewer.java rename to src/eva2/gui/DataViewer.java index 449ef7ac..de4de9d2 100644 --- a/src/javaeva/gui/DataViewer.java +++ b/src/eva2/gui/DataViewer.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/DataViewerInterface.java b/src/eva2/gui/DataViewerInterface.java similarity index 96% rename from src/javaeva/gui/DataViewerInterface.java rename to src/eva2/gui/DataViewerInterface.java index 3a0823a3..12b705dd 100644 --- a/src/javaeva/gui/DataViewerInterface.java +++ b/src/eva2/gui/DataViewerInterface.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/Exp.java b/src/eva2/gui/Exp.java similarity index 98% rename from src/javaeva/gui/Exp.java rename to src/eva2/gui/Exp.java index c04c5c2f..5badcfae 100644 --- a/src/javaeva/gui/Exp.java +++ b/src/eva2/gui/Exp.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/ExtAction.java b/src/eva2/gui/ExtAction.java similarity index 98% rename from src/javaeva/gui/ExtAction.java rename to src/eva2/gui/ExtAction.java index 0a9a7e4f..7eb821e9 100644 --- a/src/javaeva/gui/ExtAction.java +++ b/src/eva2/gui/ExtAction.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/ExtActionChangedListener.java b/src/eva2/gui/ExtActionChangedListener.java similarity index 97% rename from src/javaeva/gui/ExtActionChangedListener.java rename to src/eva2/gui/ExtActionChangedListener.java index d1a4fc37..236b0b46 100644 --- a/src/javaeva/gui/ExtActionChangedListener.java +++ b/src/eva2/gui/ExtActionChangedListener.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/ExtDesktopManager.java b/src/eva2/gui/ExtDesktopManager.java similarity index 99% rename from src/javaeva/gui/ExtDesktopManager.java rename to src/eva2/gui/ExtDesktopManager.java index e3f38e5a..7a3619c4 100644 --- a/src/javaeva/gui/ExtDesktopManager.java +++ b/src/eva2/gui/ExtDesktopManager.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/FunctionArea.java b/src/eva2/gui/FunctionArea.java similarity index 99% rename from src/javaeva/gui/FunctionArea.java rename to src/eva2/gui/FunctionArea.java index 1016205e..ffe1b696 100644 --- a/src/javaeva/gui/FunctionArea.java +++ b/src/eva2/gui/FunctionArea.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA @@ -29,13 +29,14 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.mocco.paretofrontviewer.InterfaceRefPointListener; import javax.swing.JFileChooser; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.mocco.paretofrontviewer.InterfaceRefPointListener; + import wsi.ra.chart2d.DArea; import wsi.ra.chart2d.DBorder; import wsi.ra.chart2d.DPoint; diff --git a/src/javaeva/gui/GenericAreaEditor.java b/src/eva2/gui/GenericAreaEditor.java similarity index 96% rename from src/javaeva/gui/GenericAreaEditor.java rename to src/eva2/gui/GenericAreaEditor.java index 8d90ca00..f9ec3c91 100644 --- a/src/javaeva/gui/GenericAreaEditor.java +++ b/src/eva2/gui/GenericAreaEditor.java @@ -1,10 +1,12 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.tools.EVAHELP; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.individuals.codings.gp.GPArea; import javax.swing.*; + +import eva2.server.go.individuals.codings.gp.AbstractGPNode; +import eva2.server.go.individuals.codings.gp.GPArea; +import eva2.tools.EVAHELP; + import java.beans.PropertyEditorSupport; import java.beans.PropertyEditor; import java.beans.PropertyChangeListener; diff --git a/src/javaeva/gui/GenericArrayEditor.java b/src/eva2/gui/GenericArrayEditor.java similarity index 99% rename from src/javaeva/gui/GenericArrayEditor.java rename to src/eva2/gui/GenericArrayEditor.java index 5b79316e..d7dafbae 100644 --- a/src/javaeva/gui/GenericArrayEditor.java +++ b/src/eva2/gui/GenericArrayEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -13,8 +13,6 @@ package javaeva.gui; * IMPORTS *==========================================================================*/ -import javaeva.tools.EVAHELP; -import javaeva.tools.SelectedTag; import java.awt.*; import java.awt.event.*; @@ -31,6 +29,10 @@ import javax.swing.JOptionPane; import javax.swing.DefaultListModel; import javax.swing.JScrollPane; import javax.swing.DefaultListCellRenderer; + +import eva2.tools.EVAHELP; +import eva2.tools.SelectedTag; + import java.beans.PropertyEditor; import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeListener; diff --git a/src/javaeva/gui/GenericDoubleArrayEditor.java b/src/eva2/gui/GenericDoubleArrayEditor.java similarity index 99% rename from src/javaeva/gui/GenericDoubleArrayEditor.java rename to src/eva2/gui/GenericDoubleArrayEditor.java index 1af18b82..4c866147 100644 --- a/src/javaeva/gui/GenericDoubleArrayEditor.java +++ b/src/eva2/gui/GenericDoubleArrayEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import javax.swing.*; import java.beans.PropertyEditor; diff --git a/src/javaeva/gui/GenericEpsilonConstraintEditor.java b/src/eva2/gui/GenericEpsilonConstraintEditor.java similarity index 99% rename from src/javaeva/gui/GenericEpsilonConstraintEditor.java rename to src/eva2/gui/GenericEpsilonConstraintEditor.java index cbffd159..3b6e9375 100644 --- a/src/javaeva/gui/GenericEpsilonConstraintEditor.java +++ b/src/eva2/gui/GenericEpsilonConstraintEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import javax.swing.*; import java.beans.PropertyEditor; diff --git a/src/javaeva/gui/GenericEpsilonThresholdEditor.java b/src/eva2/gui/GenericEpsilonThresholdEditor.java similarity index 99% rename from src/javaeva/gui/GenericEpsilonThresholdEditor.java rename to src/eva2/gui/GenericEpsilonThresholdEditor.java index a2d1eb86..a3bced3a 100644 --- a/src/javaeva/gui/GenericEpsilonThresholdEditor.java +++ b/src/eva2/gui/GenericEpsilonThresholdEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import javax.swing.*; import java.beans.PropertyEditor; diff --git a/src/javaeva/gui/GenericFilePathEditor.java b/src/eva2/gui/GenericFilePathEditor.java similarity index 99% rename from src/javaeva/gui/GenericFilePathEditor.java rename to src/eva2/gui/GenericFilePathEditor.java index 5539a981..73c3cdc1 100644 --- a/src/javaeva/gui/GenericFilePathEditor.java +++ b/src/eva2/gui/GenericFilePathEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import javax.swing.*; import java.beans.PropertyEditor; diff --git a/src/javaeva/gui/GenericIntArrayEditor.java b/src/eva2/gui/GenericIntArrayEditor.java similarity index 99% rename from src/javaeva/gui/GenericIntArrayEditor.java rename to src/eva2/gui/GenericIntArrayEditor.java index ba35b9a6..bf556185 100644 --- a/src/javaeva/gui/GenericIntArrayEditor.java +++ b/src/eva2/gui/GenericIntArrayEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import javax.swing.*; import java.beans.PropertyEditor; diff --git a/src/javaeva/gui/GenericObjectEditor.java b/src/eva2/gui/GenericObjectEditor.java similarity index 99% rename from src/javaeva/gui/GenericObjectEditor.java rename to src/eva2/gui/GenericObjectEditor.java index dd71c5cb..d0dfeba2 100644 --- a/src/javaeva/gui/GenericObjectEditor.java +++ b/src/eva2/gui/GenericObjectEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -45,9 +45,6 @@ import java.util.ArrayList; import java.util.StringTokenizer; import java.util.Vector; -import javaeva.client.EvAClient; -import javaeva.tools.EVAHELP; -import javaeva.tools.ReflectPackage; import javax.swing.BorderFactory; import javax.swing.DefaultComboBoxModel; @@ -57,6 +54,10 @@ import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.JPanel; +import eva2.client.EvAClient; +import eva2.tools.EVAHELP; +import eva2.tools.ReflectPackage; + import wsi.ra.jproxy.RMIProxyLocal; diff --git a/src/javaeva/gui/GenericOptimizationObjectivesEditor.java b/src/eva2/gui/GenericOptimizationObjectivesEditor.java similarity index 98% rename from src/javaeva/gui/GenericOptimizationObjectivesEditor.java rename to src/eva2/gui/GenericOptimizationObjectivesEditor.java index c67f1d4e..09493598 100644 --- a/src/javaeva/gui/GenericOptimizationObjectivesEditor.java +++ b/src/eva2/gui/GenericOptimizationObjectivesEditor.java @@ -1,10 +1,12 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.server.go.problems.InterfaceOptimizationTarget; -import javaeva.server.go.tools.GeneralGOEProperty; import javax.swing.*; + +import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.problems.InterfaceOptimizationTarget; +import eva2.server.go.tools.GeneralGOEProperty; + import java.beans.*; import java.awt.*; import java.awt.event.*; diff --git a/src/javaeva/gui/GenericOptimizationObjectivesWithParamEditor.java b/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java similarity index 99% rename from src/javaeva/gui/GenericOptimizationObjectivesWithParamEditor.java rename to src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java index fc571670..a64ee8db 100644 --- a/src/javaeva/gui/GenericOptimizationObjectivesWithParamEditor.java +++ b/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java @@ -1,9 +1,11 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.server.go.tools.GeneralGOEProperty; import javax.swing.*; + +import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.tools.GeneralGOEProperty; + import java.beans.*; import java.awt.*; import java.awt.event.ActionListener; diff --git a/src/javaeva/gui/GenericRemoteServersEditor.java b/src/eva2/gui/GenericRemoteServersEditor.java similarity index 99% rename from src/javaeva/gui/GenericRemoteServersEditor.java rename to src/eva2/gui/GenericRemoteServersEditor.java index d0614941..5eb04450 100644 --- a/src/javaeva/gui/GenericRemoteServersEditor.java +++ b/src/eva2/gui/GenericRemoteServersEditor.java @@ -1,8 +1,11 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.tool.BasicResourceLoader; import javax.swing.*; + +import eva2.server.go.SwingWorker; + import java.beans.PropertyEditor; import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeListener; @@ -12,7 +15,6 @@ import java.io.*; import java.util.Vector; import java.util.Enumeration; -import javaeva.server.go.SwingWorker; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/GenericStringListEditor.java b/src/eva2/gui/GenericStringListEditor.java similarity index 97% rename from src/javaeva/gui/GenericStringListEditor.java rename to src/eva2/gui/GenericStringListEditor.java index 9ec80542..3abce0db 100644 --- a/src/javaeva/gui/GenericStringListEditor.java +++ b/src/eva2/gui/GenericStringListEditor.java @@ -1,9 +1,11 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.individuals.codings.gp.GPArea; import javax.swing.*; + +import eva2.server.go.individuals.codings.gp.AbstractGPNode; +import eva2.server.go.individuals.codings.gp.GPArea; + import java.beans.PropertyEditor; import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeListener; diff --git a/src/javaeva/gui/GenericWeigthedLPTchebycheffEditor.java b/src/eva2/gui/GenericWeigthedLPTchebycheffEditor.java similarity index 99% rename from src/javaeva/gui/GenericWeigthedLPTchebycheffEditor.java rename to src/eva2/gui/GenericWeigthedLPTchebycheffEditor.java index 90f9e56f..b73c1a01 100644 --- a/src/javaeva/gui/GenericWeigthedLPTchebycheffEditor.java +++ b/src/eva2/gui/GenericWeigthedLPTchebycheffEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import javax.swing.*; import java.beans.PropertyEditor; diff --git a/src/javaeva/gui/Graph.java b/src/eva2/gui/Graph.java similarity index 99% rename from src/javaeva/gui/Graph.java rename to src/eva2/gui/Graph.java index d62bb677..425da82c 100644 --- a/src/javaeva/gui/Graph.java +++ b/src/eva2/gui/Graph.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import java.io.Serializable; diff --git a/src/javaeva/gui/GraphPointSet.java b/src/eva2/gui/GraphPointSet.java similarity index 99% rename from src/javaeva/gui/GraphPointSet.java rename to src/eva2/gui/GraphPointSet.java index 6bdbebe0..12cdfe7a 100644 --- a/src/javaeva/gui/GraphPointSet.java +++ b/src/eva2/gui/GraphPointSet.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/GraphWindow.java b/src/eva2/gui/GraphWindow.java similarity index 99% rename from src/javaeva/gui/GraphWindow.java rename to src/eva2/gui/GraphWindow.java index ad095be0..3055e7cf 100644 --- a/src/javaeva/gui/GraphWindow.java +++ b/src/eva2/gui/GraphWindow.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/HtmlDemo.java b/src/eva2/gui/HtmlDemo.java similarity index 95% rename from src/javaeva/gui/HtmlDemo.java rename to src/eva2/gui/HtmlDemo.java index 5cb9377a..f89d3380 100644 --- a/src/javaeva/gui/HtmlDemo.java +++ b/src/eva2/gui/HtmlDemo.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -12,7 +12,6 @@ package javaeva.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.tools.EVAHELP; import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JViewport; @@ -21,6 +20,10 @@ import javax.swing.event.HyperlinkListener; import javax.swing.event.HyperlinkEvent; import javax.swing.text.html.HTMLFrameHyperlinkEvent; import javax.swing.text.html.HTMLDocument; + +import eva2.client.EvAClient; +import eva2.tools.EVAHELP; + import java.awt.Dimension; import java.awt.BorderLayout; import java.io.IOException; @@ -29,7 +32,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.awt.Toolkit; import wsi.ra.tool.BasicResourceLoader; -import javaeva.client.EvAClient; /** * */ @@ -97,7 +99,7 @@ public class HtmlDemo { try { frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); + System.err.println("Could not find EvA2 icon, please move rescoure folder to working directory!"); } JScrollPane scroller = new JScrollPane(); JViewport vp = scroller.getViewport(); diff --git a/src/javaeva/gui/InterfaceDPointWithContent.java b/src/eva2/gui/InterfaceDPointWithContent.java similarity index 82% rename from src/javaeva/gui/InterfaceDPointWithContent.java rename to src/eva2/gui/InterfaceDPointWithContent.java index 33d748cb..3a9aefad 100644 --- a/src/javaeva/gui/InterfaceDPointWithContent.java +++ b/src/eva2/gui/InterfaceDPointWithContent.java @@ -1,7 +1,7 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/InterfaceSelectablePointIcon.java b/src/eva2/gui/InterfaceSelectablePointIcon.java similarity index 88% rename from src/javaeva/gui/InterfaceSelectablePointIcon.java rename to src/eva2/gui/InterfaceSelectablePointIcon.java index 822e731a..ba28457c 100644 --- a/src/javaeva/gui/InterfaceSelectablePointIcon.java +++ b/src/eva2/gui/InterfaceSelectablePointIcon.java @@ -1,7 +1,7 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/JClassTree.java b/src/eva2/gui/JClassTree.java similarity index 99% rename from src/javaeva/gui/JClassTree.java rename to src/eva2/gui/JClassTree.java index f06195a3..6ad91c06 100644 --- a/src/javaeva/gui/JClassTree.java +++ b/src/eva2/gui/JClassTree.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/JDocFrame.java b/src/eva2/gui/JDocFrame.java similarity index 98% rename from src/javaeva/gui/JDocFrame.java rename to src/eva2/gui/JDocFrame.java index 8886dd11..bfba022b 100644 --- a/src/javaeva/gui/JDocFrame.java +++ b/src/eva2/gui/JDocFrame.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/JEFrame.java b/src/eva2/gui/JEFrame.java similarity index 99% rename from src/javaeva/gui/JEFrame.java rename to src/eva2/gui/JEFrame.java index 852f0e35..833f2608 100644 --- a/src/javaeva/gui/JEFrame.java +++ b/src/eva2/gui/JEFrame.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/JEFrameRegister.java b/src/eva2/gui/JEFrameRegister.java similarity index 98% rename from src/javaeva/gui/JEFrameRegister.java rename to src/eva2/gui/JEFrameRegister.java index 62a29b47..54422fa7 100644 --- a/src/javaeva/gui/JEFrameRegister.java +++ b/src/eva2/gui/JEFrameRegister.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import java.util.ArrayList; /* * Title: JavaEvA diff --git a/src/javaeva/gui/JExtDesktopPane.java b/src/eva2/gui/JExtDesktopPane.java similarity index 97% rename from src/javaeva/gui/JExtDesktopPane.java rename to src/eva2/gui/JExtDesktopPane.java index 06495e1c..46d82c6e 100644 --- a/src/javaeva/gui/JExtDesktopPane.java +++ b/src/eva2/gui/JExtDesktopPane.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -65,7 +65,7 @@ public class JExtDesktopPane extends JDesktopPane{ } }); - m_mnuWindow.add(actWindowOverlap = new ExtAction("Ü&berlappend", "Ordnet die Fenster überlappend an"){ + m_mnuWindow.add(actWindowOverlap = new ExtAction("�&berlappend", "Ordnet die Fenster �berlappend an"){ public void actionPerformed(ActionEvent e){ overlapWindows(); } @@ -89,7 +89,7 @@ public class JExtDesktopPane extends JDesktopPane{ JScrollPane pane = new JScrollPane(list); pane.setPreferredSize(new Dimension(pane.getPreferredSize().width, 150)); - if(JOptionPane.showOptionDialog(JExtDesktopPane.this, pane, "Fenster auswählen", JOptionPane.OK_CANCEL_OPTION, + if(JOptionPane.showOptionDialog(JExtDesktopPane.this, pane, "Fenster ausw�hlen", JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE, null, null, null) == JOptionPane.OK_OPTION) if(list.getSelectedIndex() != -1) selectFrame(frames[list.getSelectedIndex()]); } diff --git a/src/javaeva/gui/JExtFileChooser.java b/src/eva2/gui/JExtFileChooser.java similarity index 85% rename from src/javaeva/gui/JExtFileChooser.java rename to src/eva2/gui/JExtFileChooser.java index c727bc31..1c33e392 100644 --- a/src/javaeva/gui/JExtFileChooser.java +++ b/src/eva2/gui/JExtFileChooser.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -31,7 +31,7 @@ public class JExtFileChooser extends JFileChooser{ File f = getSelectedFile(); if(f != null && f.exists()) - if(JOptionPane.showConfirmDialog(this, "Die Datei " + f.getPath() + " existiert bereits.\nSoll sie überschrieben werden?", "Achtung", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.NO_OPTION) return; + if(JOptionPane.showConfirmDialog(this, "Die Datei " + f.getPath() + " existiert bereits.\nSoll sie �berschrieben werden?", "Achtung", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.NO_OPTION) return; } super.approveSelection(); diff --git a/src/javaeva/gui/JExtMenu.java b/src/eva2/gui/JExtMenu.java similarity index 99% rename from src/javaeva/gui/JExtMenu.java rename to src/eva2/gui/JExtMenu.java index f3b80ce6..24f9c5a9 100644 --- a/src/javaeva/gui/JExtMenu.java +++ b/src/eva2/gui/JExtMenu.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/JExtToolBar.java b/src/eva2/gui/JExtToolBar.java similarity index 99% rename from src/javaeva/gui/JExtToolBar.java rename to src/eva2/gui/JExtToolBar.java index 34671af7..2958aa3d 100644 --- a/src/javaeva/gui/JExtToolBar.java +++ b/src/eva2/gui/JExtToolBar.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/JModuleGeneralPanel.java b/src/eva2/gui/JModuleGeneralPanel.java similarity index 98% rename from src/javaeva/gui/JModuleGeneralPanel.java rename to src/eva2/gui/JModuleGeneralPanel.java index d79cf26a..f40db53e 100644 --- a/src/javaeva/gui/JModuleGeneralPanel.java +++ b/src/eva2/gui/JModuleGeneralPanel.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -16,7 +16,6 @@ package javaeva.gui; import java.io.Serializable; import java.net.InetAddress; -import javaeva.server.modules.ModuleAdapter; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -25,6 +24,8 @@ import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JPanel; +import eva2.server.modules.ModuleAdapter; + import wsi.ra.jproxy.RMIProxyLocal; import wsi.ra.jproxy.RemoteStateListener; /*==========================================================================* diff --git a/src/javaeva/gui/JParaPanel.java b/src/eva2/gui/JParaPanel.java similarity index 99% rename from src/javaeva/gui/JParaPanel.java rename to src/eva2/gui/JParaPanel.java index 1eb1f229..2650a6ea 100644 --- a/src/javaeva/gui/JParaPanel.java +++ b/src/eva2/gui/JParaPanel.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA diff --git a/src/javaeva/gui/JTabbedModuleFrame.java b/src/eva2/gui/JTabbedModuleFrame.java similarity index 94% rename from src/javaeva/gui/JTabbedModuleFrame.java rename to src/eva2/gui/JTabbedModuleFrame.java index ef9a154f..f24f6f41 100644 --- a/src/javaeva/gui/JTabbedModuleFrame.java +++ b/src/eva2/gui/JTabbedModuleFrame.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -12,10 +12,6 @@ package javaeva.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.gui.JModuleGeneralPanel; -import javaeva.gui.JParaPanel; -import javaeva.server.modules.ModuleAdapter; -import javaeva.client.EvAClient; import java.io.Serializable; import java.awt.*; @@ -24,6 +20,12 @@ import java.awt.print.* ; import javax.swing.*; import javax.swing.border.*; import javax.swing.event.*; + +import eva2.client.EvAClient; +import eva2.gui.JModuleGeneralPanel; +import eva2.gui.JParaPanel; +import eva2.server.modules.ModuleAdapter; + import java.util.ArrayList; import wsi.ra.tool.BasicResourceLoader; /*==========================================================================* @@ -105,7 +107,7 @@ public class JTabbedModuleFrame implements Serializable { try { m_Frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move resource folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move resource folder to working directory!"); } JPanel m_SuperPanel = createContentPane(); diff --git a/src/javaeva/gui/JTextEditorInternalFrame.java b/src/eva2/gui/JTextEditorInternalFrame.java similarity index 96% rename from src/javaeva/gui/JTextEditorInternalFrame.java rename to src/eva2/gui/JTextEditorInternalFrame.java index 6e1aa726..03672a6e 100644 --- a/src/javaeva/gui/JTextEditorInternalFrame.java +++ b/src/eva2/gui/JTextEditorInternalFrame.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -29,7 +29,7 @@ public class JTextEditorInternalFrame extends JDocFrame{ protected UndoManager undo = new UndoManager(); private class UndoAction extends ExtAction{ public UndoAction(){ - super("Rückgängig", new ImageIcon("images/EditUndo.gif"), "Macht die letzte Aktion rückgängig", + super("R�ckg�ngig", new ImageIcon("images/EditUndo.gif"), "Macht die letzte Aktion r�ckg�ngig", KeyStroke.getKeyStroke(KeyEvent.VK_Z, Event.CTRL_MASK)); setEnabled(false); } @@ -51,7 +51,7 @@ public class JTextEditorInternalFrame extends JDocFrame{ } else{ setEnabled(false); - putValue(Action.NAME, "Rückgängig"); + putValue(Action.NAME, "R�ckg�ngig"); } } } // end of inner class UndoAction @@ -171,9 +171,9 @@ public class JTextEditorInternalFrame extends JDocFrame{ keyActions = keys.getKeyStrokesForAction(a); if(keyActions != null && keyActions.length > 0) a.putValue(ExtAction.KEYSTROKE, keyActions[0]); a.putValue(Action.SMALL_ICON, new ImageIcon("images/EditPaste.gif")); - a.putValue(ExtAction.CAPTION, "Einfügen"); + a.putValue(ExtAction.CAPTION, "Einf�gen"); a.putValue(ExtAction.MNEMONIC, new Character('e')); - a.putValue(ExtAction.TOOLTIP, "Fügt Text aus der Zwischenablage ein"); + a.putValue(ExtAction.TOOLTIP, "F�gt Text aus der Zwischenablage ein"); mnuEdit.add(a); barEdit.add(a); diff --git a/src/javaeva/gui/JTextoutputFrame.java b/src/eva2/gui/JTextoutputFrame.java similarity index 96% rename from src/javaeva/gui/JTextoutputFrame.java rename to src/eva2/gui/JTextoutputFrame.java index a0a8f024..bba7b411 100644 --- a/src/javaeva/gui/JTextoutputFrame.java +++ b/src/eva2/gui/JTextoutputFrame.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -25,8 +25,6 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.Serializable; -import javaeva.client.EvAClient; -import javaeva.tools.MultirunRefiner; import javax.swing.BorderFactory; import javax.swing.JFrame; @@ -38,6 +36,9 @@ import javax.swing.JViewport; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import eva2.client.EvAClient; +import eva2.tools.MultirunRefiner; + import wsi.ra.tool.BasicResourceLoader; /*==========================================================================* * CLASS DECLARATION @@ -110,7 +111,7 @@ Serializable { try { frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move resource folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move resource folder to working directory!"); } frame.addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) { diff --git a/src/javaeva/gui/JTextoutputFrameInterface.java b/src/eva2/gui/JTextoutputFrameInterface.java similarity index 92% rename from src/javaeva/gui/JTextoutputFrameInterface.java rename to src/eva2/gui/JTextoutputFrameInterface.java index eef53e02..e7834708 100644 --- a/src/javaeva/gui/JTextoutputFrameInterface.java +++ b/src/eva2/gui/JTextoutputFrameInterface.java @@ -1,6 +1,6 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.stat.InterfaceTextListener; +import eva2.server.stat.InterfaceTextListener; /* * Title: JavaEvA diff --git a/src/javaeva/gui/LogPanel.java b/src/eva2/gui/LogPanel.java similarity index 95% rename from src/javaeva/gui/LogPanel.java rename to src/eva2/gui/LogPanel.java index 775ff4a2..baa465eb 100644 --- a/src/javaeva/gui/LogPanel.java +++ b/src/eva2/gui/LogPanel.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -17,9 +17,11 @@ import java.text.*; import java.awt.*; import javax.swing.*; import javax.swing.event.*; + +import eva2.client.EvAClient; + import java.awt.event.*; import wsi.ra.tool.BasicResourceLoader; -import javaeva.client.EvAClient; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ @@ -97,7 +99,7 @@ public class LogPanel extends JPanel { try { frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!"); } LogPanel panel = new LogPanel(); frame.getContentPane().add(panel, BorderLayout.CENTER); diff --git a/src/javaeva/gui/Mnemonic.java b/src/eva2/gui/Mnemonic.java similarity index 97% rename from src/javaeva/gui/Mnemonic.java rename to src/eva2/gui/Mnemonic.java index 994951bc..7e50f95c 100644 --- a/src/javaeva/gui/Mnemonic.java +++ b/src/eva2/gui/Mnemonic.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/MultiLineString.java b/src/eva2/gui/MultiLineString.java similarity index 95% rename from src/javaeva/gui/MultiLineString.java rename to src/eva2/gui/MultiLineString.java index 1e54f7ef..ad15e38d 100644 --- a/src/javaeva/gui/MultiLineString.java +++ b/src/eva2/gui/MultiLineString.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** *

Title: The JavaEvA

diff --git a/src/javaeva/gui/MultiLineStringEditor.java b/src/eva2/gui/MultiLineStringEditor.java similarity index 99% rename from src/javaeva/gui/MultiLineStringEditor.java rename to src/eva2/gui/MultiLineStringEditor.java index 1109cc67..c31e5a07 100644 --- a/src/javaeva/gui/MultiLineStringEditor.java +++ b/src/eva2/gui/MultiLineStringEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import java.beans.*; import java.awt.*; diff --git a/src/javaeva/gui/Plot.java b/src/eva2/gui/Plot.java similarity index 98% rename from src/javaeva/gui/Plot.java rename to src/eva2/gui/Plot.java index 2e936e35..79a8355e 100644 --- a/src/javaeva/gui/Plot.java +++ b/src/eva2/gui/Plot.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -34,7 +34,6 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import javaeva.client.EvAClient; import javax.swing.JButton; import javax.swing.JFileChooser; @@ -44,6 +43,8 @@ import javax.swing.JPanel; import com.sun.image.codec.jpeg.JPEGCodec; import com.sun.image.codec.jpeg.JPEGImageEncoder; + +import eva2.client.EvAClient; import wsi.ra.chart2d.DPointSet; import wsi.ra.tool.BasicResourceLoader; /*==========================================================================* @@ -109,7 +110,7 @@ public class Plot implements PlotInterface, Serializable { try { m_Frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!"); } m_ButtonPanel = new JPanel(); diff --git a/src/javaeva/gui/PlotInterface.java b/src/eva2/gui/PlotInterface.java similarity index 98% rename from src/javaeva/gui/PlotInterface.java rename to src/eva2/gui/PlotInterface.java index 4b303d82..f8797c47 100644 --- a/src/javaeva/gui/PlotInterface.java +++ b/src/eva2/gui/PlotInterface.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/PropertyBoolSelector.java b/src/eva2/gui/PropertyBoolSelector.java similarity index 98% rename from src/javaeva/gui/PropertyBoolSelector.java rename to src/eva2/gui/PropertyBoolSelector.java index 97cd1120..25a45d71 100644 --- a/src/javaeva/gui/PropertyBoolSelector.java +++ b/src/eva2/gui/PropertyBoolSelector.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/PropertyDialog.java b/src/eva2/gui/PropertyDialog.java similarity index 92% rename from src/javaeva/gui/PropertyDialog.java rename to src/eva2/gui/PropertyDialog.java index 231dded1..9eefb2e1 100644 --- a/src/javaeva/gui/PropertyDialog.java +++ b/src/eva2/gui/PropertyDialog.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -12,16 +12,18 @@ package javaeva.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.tools.EVAHELP; import java.awt.Component; import java.awt.Toolkit; import java.beans.PropertyEditor; import javax.swing.JFrame; + +import eva2.client.EvAClient; +import eva2.tools.EVAHELP; + import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.BorderLayout; import wsi.ra.tool.BasicResourceLoader; -import javaeva.client.EvAClient; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ @@ -41,7 +43,7 @@ public class PropertyDialog extends JEFrame { try { setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!"); } //System.out.println("PropertyDialog.Constructor of "+ Title); addWindowListener(new WindowAdapter() { diff --git a/src/javaeva/gui/PropertyDoubleArray.java b/src/eva2/gui/PropertyDoubleArray.java similarity index 98% rename from src/javaeva/gui/PropertyDoubleArray.java rename to src/eva2/gui/PropertyDoubleArray.java index f48d4459..f4b6b78d 100644 --- a/src/javaeva/gui/PropertyDoubleArray.java +++ b/src/eva2/gui/PropertyDoubleArray.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyEditorProvider.java b/src/eva2/gui/PropertyEditorProvider.java similarity index 96% rename from src/javaeva/gui/PropertyEditorProvider.java rename to src/eva2/gui/PropertyEditorProvider.java index d8a0e3e6..7aea23aa 100644 --- a/src/javaeva/gui/PropertyEditorProvider.java +++ b/src/eva2/gui/PropertyEditorProvider.java @@ -1,13 +1,14 @@ -package javaeva.gui; +package eva2.gui; import java.awt.Color; import java.beans.PropertyDescriptor; import java.beans.PropertyEditor; import java.beans.PropertyEditorManager; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.codings.gp.GPArea; -import javaeva.tools.SelectedTag; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.individuals.codings.gp.GPArea; +import eva2.tools.SelectedTag; + import sun.beans.editors.DoubleEditor; import sun.beans.editors.IntEditor; @@ -162,6 +163,6 @@ public class PropertyEditorProvider { PropertyEditorManager.registerEditor(PropertyRemoteServers.class , GenericRemoteServersEditor.class); PropertyEditorManager.registerEditor(PropertyOptimizationObjectives.class , GenericOptimizationObjectivesEditor.class); PropertyEditorManager.registerEditor(PropertyOptimizationObjectivesWithParam.class , GenericOptimizationObjectivesWithParamEditor.class); - PropertyEditorManager.registerEditor(javaeva.gui.MultiLineString.class, javaeva.gui.MultiLineStringEditor.class); + PropertyEditorManager.registerEditor(eva2.gui.MultiLineString.class, eva2.gui.MultiLineStringEditor.class); } } diff --git a/src/javaeva/gui/PropertyEpsilonConstraint.java b/src/eva2/gui/PropertyEpsilonConstraint.java similarity index 97% rename from src/javaeva/gui/PropertyEpsilonConstraint.java rename to src/eva2/gui/PropertyEpsilonConstraint.java index 3a05327e..e63ace5d 100644 --- a/src/javaeva/gui/PropertyEpsilonConstraint.java +++ b/src/eva2/gui/PropertyEpsilonConstraint.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyEpsilonThreshold.java b/src/eva2/gui/PropertyEpsilonThreshold.java similarity index 98% rename from src/javaeva/gui/PropertyEpsilonThreshold.java rename to src/eva2/gui/PropertyEpsilonThreshold.java index 26d8d2da..8f0a58be 100644 --- a/src/javaeva/gui/PropertyEpsilonThreshold.java +++ b/src/eva2/gui/PropertyEpsilonThreshold.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyFilePath.java b/src/eva2/gui/PropertyFilePath.java similarity index 98% rename from src/javaeva/gui/PropertyFilePath.java rename to src/eva2/gui/PropertyFilePath.java index fc2a50e8..7867fe2f 100644 --- a/src/javaeva/gui/PropertyFilePath.java +++ b/src/eva2/gui/PropertyFilePath.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyIntArray.java b/src/eva2/gui/PropertyIntArray.java similarity index 97% rename from src/javaeva/gui/PropertyIntArray.java rename to src/eva2/gui/PropertyIntArray.java index b0c9a44e..897a4b5d 100644 --- a/src/javaeva/gui/PropertyIntArray.java +++ b/src/eva2/gui/PropertyIntArray.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyOptimizationObjectives.java b/src/eva2/gui/PropertyOptimizationObjectives.java similarity index 97% rename from src/javaeva/gui/PropertyOptimizationObjectives.java rename to src/eva2/gui/PropertyOptimizationObjectives.java index 21e4c145..ec32b311 100644 --- a/src/javaeva/gui/PropertyOptimizationObjectives.java +++ b/src/eva2/gui/PropertyOptimizationObjectives.java @@ -1,6 +1,6 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.problems.InterfaceOptimizationObjective; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyOptimizationObjectivesWithParam.java b/src/eva2/gui/PropertyOptimizationObjectivesWithParam.java similarity index 98% rename from src/javaeva/gui/PropertyOptimizationObjectivesWithParam.java rename to src/eva2/gui/PropertyOptimizationObjectivesWithParam.java index 186d2a63..620a527f 100644 --- a/src/javaeva/gui/PropertyOptimizationObjectivesWithParam.java +++ b/src/eva2/gui/PropertyOptimizationObjectivesWithParam.java @@ -1,6 +1,6 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.problems.InterfaceOptimizationObjective; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyPanel.java b/src/eva2/gui/PropertyPanel.java similarity index 98% rename from src/javaeva/gui/PropertyPanel.java rename to src/eva2/gui/PropertyPanel.java index 36e9e8c5..01b1eba0 100644 --- a/src/javaeva/gui/PropertyPanel.java +++ b/src/eva2/gui/PropertyPanel.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -19,10 +19,11 @@ import java.awt.Rectangle; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.beans.PropertyEditor; -import javaeva.tools.EVAHELP; import javax.swing.BorderFactory; import javax.swing.JPanel; + +import eva2.tools.EVAHELP; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/javaeva/gui/PropertyRemoteServers.java b/src/eva2/gui/PropertyRemoteServers.java similarity index 99% rename from src/javaeva/gui/PropertyRemoteServers.java rename to src/eva2/gui/PropertyRemoteServers.java index 942224c6..024a10fe 100644 --- a/src/javaeva/gui/PropertyRemoteServers.java +++ b/src/eva2/gui/PropertyRemoteServers.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; //import javaeva.tools.ServerStarter; import java.rmi.Naming; diff --git a/src/javaeva/gui/PropertySheetPanel.java b/src/eva2/gui/PropertySheetPanel.java similarity index 99% rename from src/javaeva/gui/PropertySheetPanel.java rename to src/eva2/gui/PropertySheetPanel.java index 00b5b06b..a1ba898f 100644 --- a/src/javaeva/gui/PropertySheetPanel.java +++ b/src/eva2/gui/PropertySheetPanel.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -36,8 +36,6 @@ import java.beans.PropertyVetoException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javaeva.tools.EVAHELP; -import javaeva.tools.StringTools; import javax.swing.BorderFactory; import javax.swing.JButton; @@ -46,6 +44,9 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextArea; import javax.swing.SwingConstants; + +import eva2.tools.EVAHELP; +import eva2.tools.StringTools; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/javaeva/gui/PropertySheetPanelStat.java b/src/eva2/gui/PropertySheetPanelStat.java similarity index 98% rename from src/javaeva/gui/PropertySheetPanelStat.java rename to src/eva2/gui/PropertySheetPanelStat.java index 971aeeb5..2e91943f 100644 --- a/src/javaeva/gui/PropertySheetPanelStat.java +++ b/src/eva2/gui/PropertySheetPanelStat.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -18,8 +18,9 @@ import java.awt.event.*; import java.beans.*; import java.lang.reflect.*; import javax.swing.*; + +import eva2.tools.EVAHELP; import sun.beans.editors.*; -import javaeva.tools.EVAHELP; import java.io.Serializable; /*==========================================================================* * CLASS DECLARATION diff --git a/src/javaeva/gui/PropertySlider.java b/src/eva2/gui/PropertySlider.java similarity index 99% rename from src/javaeva/gui/PropertySlider.java rename to src/eva2/gui/PropertySlider.java index a7ffaf87..1e7140af 100644 --- a/src/javaeva/gui/PropertySlider.java +++ b/src/eva2/gui/PropertySlider.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/PropertyStringList.java b/src/eva2/gui/PropertyStringList.java similarity index 98% rename from src/javaeva/gui/PropertyStringList.java rename to src/eva2/gui/PropertyStringList.java index 9af38fb2..58717403 100644 --- a/src/javaeva/gui/PropertyStringList.java +++ b/src/eva2/gui/PropertyStringList.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyText.java b/src/eva2/gui/PropertyText.java similarity index 98% rename from src/javaeva/gui/PropertyText.java rename to src/eva2/gui/PropertyText.java index daebca19..2306821b 100644 --- a/src/javaeva/gui/PropertyText.java +++ b/src/eva2/gui/PropertyText.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/PropertyValueSelector.java b/src/eva2/gui/PropertyValueSelector.java similarity index 98% rename from src/javaeva/gui/PropertyValueSelector.java rename to src/eva2/gui/PropertyValueSelector.java index 7c04caee..11985e17 100644 --- a/src/javaeva/gui/PropertyValueSelector.java +++ b/src/eva2/gui/PropertyValueSelector.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/PropertyWeightedLPTchebycheff.java b/src/eva2/gui/PropertyWeightedLPTchebycheff.java similarity index 97% rename from src/javaeva/gui/PropertyWeightedLPTchebycheff.java rename to src/eva2/gui/PropertyWeightedLPTchebycheff.java index 9f350129..8ea601e3 100644 --- a/src/javaeva/gui/PropertyWeightedLPTchebycheff.java +++ b/src/eva2/gui/PropertyWeightedLPTchebycheff.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/SerializedObject.java b/src/eva2/gui/SerializedObject.java similarity index 99% rename from src/javaeva/gui/SerializedObject.java rename to src/eva2/gui/SerializedObject.java index a4393f3e..e72cb9bd 100644 --- a/src/javaeva/gui/SerializedObject.java +++ b/src/eva2/gui/SerializedObject.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/StatisticsEditor.java b/src/eva2/gui/StatisticsEditor.java similarity index 97% rename from src/javaeva/gui/StatisticsEditor.java rename to src/eva2/gui/StatisticsEditor.java index 66eccafe..5cf58aa6 100644 --- a/src/javaeva/gui/StatisticsEditor.java +++ b/src/eva2/gui/StatisticsEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -16,7 +16,8 @@ package javaeva.gui; import java.beans.*; import java.awt.*; import javax.swing.*; -import javaeva.server.stat.GenericStatistics; + +import eva2.server.stat.GenericStatistics; /*==========================================================================* * CLASS DECLARATION diff --git a/src/javaeva/gui/TagEditor.java b/src/eva2/gui/TagEditor.java similarity index 94% rename from src/javaeva/gui/TagEditor.java rename to src/eva2/gui/TagEditor.java index f2ce0e68..ee0ed550 100644 --- a/src/javaeva/gui/TagEditor.java +++ b/src/eva2/gui/TagEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -12,16 +12,17 @@ package javaeva.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.tools.SelectedTag; -import javaeva.tools.Tag; import java.awt.BorderLayout; import java.awt.event.*; import java.awt.Toolkit; import java.beans.*; import javax.swing.*; + +import eva2.client.EvAClient; +import eva2.tools.SelectedTag; +import eva2.tools.Tag; import wsi.ra.tool.BasicResourceLoader; -import javaeva.client.EvAClient; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ @@ -126,7 +127,7 @@ public class TagEditor extends PropertyEditorSupport { try { f.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!"); } f.addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) { diff --git a/src/javaeva/gui/TopoPlot.java b/src/eva2/gui/TopoPlot.java similarity index 98% rename from src/javaeva/gui/TopoPlot.java rename to src/eva2/gui/TopoPlot.java index 6b123155..738648bf 100644 --- a/src/javaeva/gui/TopoPlot.java +++ b/src/eva2/gui/TopoPlot.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -15,7 +15,8 @@ package javaeva.gui; import wsi.ra.chart2d.*; import java.awt.*; -import javaeva.server.go.problems.Interface2DBorderProblem; +import eva2.server.go.problems.Interface2DBorderProblem; + import wsi.ra.diagram.ColorBarCalculator; /*==========================================================================* diff --git a/src/javaeva/gui/TreeElement.java b/src/eva2/gui/TreeElement.java similarity index 96% rename from src/javaeva/gui/TreeElement.java rename to src/eva2/gui/TreeElement.java index ac4405d9..f51bd5fd 100644 --- a/src/javaeva/gui/TreeElement.java +++ b/src/eva2/gui/TreeElement.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/WindowCloseAction.java b/src/eva2/gui/WindowCloseAction.java similarity index 99% rename from src/javaeva/gui/WindowCloseAction.java rename to src/eva2/gui/WindowCloseAction.java index 91315e07..754917f4 100644 --- a/src/javaeva/gui/WindowCloseAction.java +++ b/src/eva2/gui/WindowCloseAction.java @@ -1,3 +1,4 @@ +package eva2.gui; //package javaeva.gui; ///*==========================================================================* // * IMPORTS diff --git a/src/javaeva/server/EvAMainAdapter.java b/src/eva2/server/EvAMainAdapter.java similarity index 93% rename from src/javaeva/server/EvAMainAdapter.java rename to src/eva2/server/EvAMainAdapter.java index c093878e..4c3ffa89 100644 --- a/src/javaeva/server/EvAMainAdapter.java +++ b/src/eva2/server/EvAMainAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server; +package eva2.server; /** * Title: javaeva * Description: API for distributed and parallel computing. @@ -12,7 +12,7 @@ package javaeva.server; * IMPORTS *==========================================================================*/ -import javaeva.server.modules.ModuleAdapter; +import eva2.server.modules.ModuleAdapter; import wsi.ra.jproxy.MainAdapter; import wsi.ra.jproxy.MainAdapterClient; /*==========================================================================* diff --git a/src/javaeva/server/EvAMainAdapterImpl.java b/src/eva2/server/EvAMainAdapterImpl.java similarity index 93% rename from src/javaeva/server/EvAMainAdapterImpl.java rename to src/eva2/server/EvAMainAdapterImpl.java index a5a90a07..4e6eb27e 100644 --- a/src/javaeva/server/EvAMainAdapterImpl.java +++ b/src/eva2/server/EvAMainAdapterImpl.java @@ -1,4 +1,4 @@ -package javaeva.server; +package eva2.server; /** * Title: The JProxy Framework @@ -12,8 +12,8 @@ package javaeva.server; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.client.EvAClient; -import javaeva.server.modules.ModuleAdapter; +import eva2.client.EvAClient; +import eva2.server.modules.ModuleAdapter; import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.MainAdapterImpl; /*==========================================================================* diff --git a/src/javaeva/server/EvAServer.java b/src/eva2/server/EvAServer.java similarity index 94% rename from src/javaeva/server/EvAServer.java rename to src/eva2/server/EvAServer.java index 64fdeb86..cff80a89 100644 --- a/src/javaeva/server/EvAServer.java +++ b/src/eva2/server/EvAServer.java @@ -1,4 +1,4 @@ -package javaeva.server; +package eva2.server; /* * Title: JavaEvA * Description: @@ -108,8 +108,9 @@ public class EvAServer { } if (TRACE) System.out.println(" start multiServers int i= "+i); try { - System.out.println("Calling the command:"+"java -cp \".:../lib/jdom.jar\" javaeva.server.EvAServer nomulti"); - Process pro = Runtime.getRuntime().exec("java -cp \".:../lib/jdom.jar:../lib/log4j.jar\" javaeva.server.EvAServer nomulti"); + String cmd = "java -cp \".\" eva2.server.EvAServer nomulti"; + System.out.println("Calling the command:"+cmd); + Process pro = Runtime.getRuntime().exec(cmd); //Process pro = Runtime.getRuntime().exec("server"); BufferedReader in = new BufferedReader ( new InputStreamReader (pro.getInputStream())); //pro diff --git a/src/javaeva/server/ModuleServer.java b/src/eva2/server/ModuleServer.java similarity index 73% rename from src/javaeva/server/ModuleServer.java rename to src/eva2/server/ModuleServer.java index fe6d5f9c..05c22d89 100644 --- a/src/javaeva/server/ModuleServer.java +++ b/src/eva2/server/ModuleServer.java @@ -1,4 +1,4 @@ -package javaeva.server; +package eva2.server; /* * Title: JavaEvA @@ -18,13 +18,11 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Properties; -import javaeva.server.modules.ModuleAdapter; -import javaeva.tools.EVAERROR; -import javaeva.tools.EVAHELP; -import javaeva.tools.ReflectPackage; - import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.RMIProxyLocal; +import eva2.server.modules.ModuleAdapter; +import eva2.tools.EVAERROR; +import eva2.tools.ReflectPackage; /*==========================================================================* * CLASS DECLARATION @@ -35,8 +33,8 @@ import wsi.ra.jproxy.RMIProxyLocal; public class ModuleServer { public static boolean TRACE = false; private int m_InstanceCounter = 0; - private ArrayList m_ModuleClassList; - private ArrayList m_RunnungModules; + private ArrayList> m_ModuleClassList; +// private ArrayList m_RunnungModules; private ModuleAdapter m_ModuleAdapter; private int m_ModuleAdapterCounter = 0; @@ -49,26 +47,26 @@ public class ModuleServer { if (m_InstanceCounter > 0) { EVAERROR.EXIT("ModuleServer twice created"); } - m_RunnungModules = new ArrayList(); - m_ModuleClassList = new ArrayList(); +// m_RunnungModules = new ArrayList(); + m_ModuleClassList = new ArrayList>(); String modulePckg = null; - Class filterBy = null; + Class filterBy = null; try { modulePckg = EvAProps.getProperty("ModulePackage"); filterBy = Class.forName(EvAProps.getProperty("ModuleFilterClass")); } catch(Exception e) { - System.err.println("Couldnt load modules:" + e.getMessage()); - System.err.println("module path was " + modulePckg); + System.err.println("Creating ModuleServer failed: couldnt load modules:" + e.getMessage()); + System.err.println("module path was " + modulePckg + ", is it valid?"); System.err.println("filter class path was " + ((filterBy==null) ? "null" : filterBy.getName())); - e.printStackTrace(); +// e.printStackTrace(); } // this gets a list of all valid modules from the package - Class[] classes = ReflectPackage.getAssignableClassesInPackage(modulePckg, filterBy, true, true); + Class[] classes = ReflectPackage.getAssignableClassesInPackage(modulePckg, filterBy, true, true); for (Object cls : classes) { - if (TRACE) System.out.println("- " + ((Class)cls).getName()); - m_ModuleClassList.add((Class)cls); + if (TRACE) System.out.println("- " + ((Class)cls).getName()); + m_ModuleClassList.add((Class)cls); } m_InstanceCounter++; @@ -81,7 +79,7 @@ public class ModuleServer { ArrayList ModuleNameList = new ArrayList(); for (int i = 0; i < m_ModuleClassList.size(); i++) { try { - Class Modul = (Class) m_ModuleClassList.get(i); + Class Modul = (Class) m_ModuleClassList.get(i); Method[] methods = Modul.getDeclaredMethods(); for (int ii = 0; ii < methods.length; ii++) { if (methods[ii].getName().equals("getName") == true) { @@ -101,16 +99,16 @@ public class ModuleServer { // and the running modules // @todo running modules sind abgeschaltet - for (int i = 0; i < m_RunnungModules.size(); i++) { - String AdapterName = null; - try { - AdapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName(); - } - catch (Exception ee) { - System.err.println("Error: GetAdapterName" + ee.getMessage()); - } - ModuleNameList.add(AdapterName); - } +// for (int i = 0; i < m_RunnungModules.size(); i++) { +// String AdapterName = null; +// try { +// AdapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName(); +// } +// catch (Exception ee) { +// System.err.println("Error: GetAdapterName" + ee.getMessage()); +// } +// ModuleNameList.add(AdapterName); +// } String[] x = new String[ModuleNameList.size()]; ModuleNameList.toArray(x); @@ -134,7 +132,7 @@ public class ModuleServer { selectedModuleName); } String moduleName; - Class module; + Class module; Method[] methods; for (int i = 0; i < m_ModuleClassList.size(); i++) { moduleName = null; @@ -159,9 +157,9 @@ public class ModuleServer { selectedModuleName); // create a module instance - Constructor[] Constructor = module.getConstructors(); + Constructor[] Constructor = module.getConstructors(); Object[] Para = new Object[2]; - Class paramTypes[] = (Constructor[0]).getParameterTypes(); + Class paramTypes[] = (Constructor[0]).getParameterTypes(); Para[0] = paramTypes[0].cast(adapterName); Para[1] = paramTypes[1].cast(Client); m_ModuleAdapter = (ModuleAdapter) Constructor[0].newInstance(Para); @@ -184,21 +182,21 @@ public class ModuleServer { return (ModuleAdapter) m_ModuleAdapter; } } - // @todo running modules sind gerade noch abgeschaltet - for (int i = 0; i < m_RunnungModules.size(); i++) { - try { - adapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName(); - } - catch (Exception e) { - System.out.println("Error : GetAdapterName" + e); - } - if (adapterName.equals(selectedModuleName)) { - if (TRACE) - System.out.println(" Choose a running Module!!! " + adapterName); - m_ModuleAdapter = ( (ModuleAdapter) m_RunnungModules.get(i)); - return (ModuleAdapter) m_ModuleAdapter; - } - } +// // @todo running modules sind gerade noch abgeschaltet +// for (int i = 0; i < m_RunnungModules.size(); i++) { +// try { +// adapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName(); +// } +// catch (Exception e) { +// System.out.println("Error : GetAdapterName" + e); +// } +// if (adapterName.equals(selectedModuleName)) { +// if (TRACE) +// System.out.println(" Choose a running Module!!! " + adapterName); +// m_ModuleAdapter = ( (ModuleAdapter) m_RunnungModules.get(i)); +// return (ModuleAdapter) m_ModuleAdapter; +// } +// } System.err.println("NO VALID MODULE DEFINED: " + selectedModuleName); return null; diff --git a/src/javaeva/server/RMIServerEvA.java b/src/eva2/server/RMIServerEvA.java similarity index 96% rename from src/javaeva/server/RMIServerEvA.java rename to src/eva2/server/RMIServerEvA.java index b9c8b408..c233a036 100644 --- a/src/javaeva/server/RMIServerEvA.java +++ b/src/eva2/server/RMIServerEvA.java @@ -1,4 +1,4 @@ -package javaeva.server; +package eva2.server; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. @@ -16,7 +16,8 @@ import java.net.MalformedURLException; import java.rmi.Naming; import java.rmi.RemoteException; import java.rmi.registry.Registry; -import javaeva.client.EvAComAdapter; + +import eva2.client.EvAComAdapter; import wsi.ra.jproxy.RMIProxyLocal; import wsi.ra.jproxy.RMIServer; diff --git a/src/javaeva/server/go/CrossoverInterface.java b/src/eva2/server/go/CrossoverInterface.java similarity index 91% rename from src/javaeva/server/go/CrossoverInterface.java rename to src/eva2/server/go/CrossoverInterface.java index 80b0b5a7..a660a79b 100644 --- a/src/javaeva/server/go/CrossoverInterface.java +++ b/src/eva2/server/go/CrossoverInterface.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /* * Title: JavaEvA * Description: @@ -12,7 +12,7 @@ package javaeva.server.go; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.server.stat.InterfaceStatistics; +import eva2.server.stat.InterfaceStatistics; /*==========================================================================* * INTERFACE DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/go/GOStandaloneVersion.java b/src/eva2/server/go/GOStandaloneVersion.java similarity index 95% rename from src/javaeva/server/go/GOStandaloneVersion.java rename to src/eva2/server/go/GOStandaloneVersion.java index 60580b89..995f4612 100644 --- a/src/javaeva/server/go/GOStandaloneVersion.java +++ b/src/eva2/server/go/GOStandaloneVersion.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; import java.awt.BorderLayout; import java.awt.List; @@ -15,26 +15,6 @@ import java.net.InetAddress; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; -import javaeva.client.EvAClient; -import javaeva.gui.JParaPanel; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.GAIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.operators.crossover.CrossoverGANPoint; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESLocal; -import javaeva.server.go.operators.mutation.MutateESStandard; -import javaeva.server.go.operators.selection.SelectTournament; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.strategies.EvolutionStrategies; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.server.modules.GOParameters; -import javaeva.tools.TokenHolder; import javax.swing.JButton; import javax.swing.JComponent; @@ -45,6 +25,27 @@ import javax.swing.JProgressBar; import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; +import eva2.client.EvAClient; +import eva2.gui.JParaPanel; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.individuals.GAIndividualDoubleData; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.operators.crossover.CrossoverGANPoint; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateESLocal; +import eva2.server.go.operators.mutation.MutateESStandard; +import eva2.server.go.operators.selection.SelectTournament; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.strategies.EvolutionStrategies; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.tools.RandomNumberGenerator; +import eva2.server.modules.GOParameters; +import eva2.tools.TokenHolder; + import wsi.ra.jproxy.ThreadProxy; /** @@ -92,7 +93,7 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu transient private boolean m_ContinueFlag; // Plot Panel stuff - transient private javaeva.gui.Plot m_Plot; + transient private eva2.gui.Plot m_Plot; transient private ArrayList m_PerformedRuns = new ArrayList(); transient private ArrayList m_TmpData; transient private BufferedWriter m_OutputFile; @@ -167,13 +168,13 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu // build the Options Panel JParaPanel paraPanel = new JParaPanel(this, "MyGUI"); Class object = null, editor = null; - String tmp = "javaeva.server.oa.go.Tools.InterfaceTest"; + String tmp = "eva2.server.oa.go.Tools.InterfaceTest"; try { object = Class.forName(tmp); } catch(java.lang.ClassNotFoundException e) { System.out.println("No Class found for " + tmp); } - tmp = "javaeva.gui.GenericObjectEditor"; + tmp = "eva2.gui.GenericObjectEditor"; try { editor = Class.forName(tmp); } catch(java.lang.ClassNotFoundException e) { @@ -181,7 +182,7 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu } if ((object != null) && (editor != null)) paraPanel.registerEditor(object, editor); this.m_O1 = (paraPanel.installActions()); - EvAClient.setProperty("javaeva.server.oa.go.Tools.InterfaceTest", "javaeva.server.oa.go.Tools.Test1,javaeva.server.oa.go.Tools.Test2"); + EvAClient.setProperty("eva2.server.oa.go.Tools.InterfaceTest", "eva2.server.oa.go.Tools.Test1,eva2.server.oa.go.Tools.Test2"); this.m_OptionsPanel = new JTabbedPane(); JParaPanel paraPanel2 = new JParaPanel(this.m_GO, "MyGUI"); this.m_O2 = (paraPanel2.installActions()); @@ -201,7 +202,7 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu double[] tmpD = new double[2]; tmpD[0] = 1; tmpD[1] = 1; - this.m_Plot = new javaeva.gui.Plot("EA Lecture Plot", "Function calls", "Fitness", true); + this.m_Plot = new eva2.gui.Plot("EA Lecture Plot", "Function calls", "Fitness", true); // validate and show this.m_Frame.validate(); this.m_Frame.setVisible(true); @@ -337,7 +338,7 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu this.m_GO.getOptimizer().getPopulation().setPopulationSize(50); F1Problem problem = new F1Problem(); tmpIndy = new ESIndividualDoubleData(); - ((ESIndividualDoubleData)tmpIndy).setMutationOperator(new MutateESLocal()); + ((AbstractEAIndividual)tmpIndy).setMutationOperator(new MutateESLocal()); ((F1Problem)problem).setEAIndividual(tmpIndy); //((FGRNInferringProblem)this.m_Problem).setUseHEigenMatrix(true); //((FGRNInferringProblem)this.m_Problem).setUseOnlyPositiveNumbers(true); diff --git a/src/javaeva/server/go/IndividualInterface.java b/src/eva2/server/go/IndividualInterface.java similarity index 97% rename from src/javaeva/server/go/IndividualInterface.java rename to src/eva2/server/go/IndividualInterface.java index 281dd9a0..58755965 100644 --- a/src/javaeva/server/go/IndividualInterface.java +++ b/src/eva2/server/go/IndividualInterface.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/server/go/InterfaceGOParameters.java b/src/eva2/server/go/InterfaceGOParameters.java similarity index 90% rename from src/javaeva/server/go/InterfaceGOParameters.java rename to src/eva2/server/go/InterfaceGOParameters.java index 58833525..76d94dd8 100644 --- a/src/javaeva/server/go/InterfaceGOParameters.java +++ b/src/eva2/server/go/InterfaceGOParameters.java @@ -1,9 +1,9 @@ -package javaeva.server.go; +package eva2.server.go; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.operators.postprocess.InterfacePostProcessParams; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; +import eva2.gui.GenericObjectEditor; +import eva2.server.go.operators.postprocess.InterfacePostProcessParams; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.InterfaceOptimizer; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/InterfaceGOStandalone.java b/src/eva2/server/go/InterfaceGOStandalone.java similarity index 90% rename from src/javaeva/server/go/InterfaceGOStandalone.java rename to src/eva2/server/go/InterfaceGOStandalone.java index 5971ee48..0fc93c49 100644 --- a/src/javaeva/server/go/InterfaceGOStandalone.java +++ b/src/eva2/server/go/InterfaceGOStandalone.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/InterfacePopulationChangedEventListener.java b/src/eva2/server/go/InterfacePopulationChangedEventListener.java similarity index 94% rename from src/javaeva/server/go/InterfacePopulationChangedEventListener.java rename to src/eva2/server/go/InterfacePopulationChangedEventListener.java index 4e021463..63ccb0ba 100644 --- a/src/javaeva/server/go/InterfacePopulationChangedEventListener.java +++ b/src/eva2/server/go/InterfacePopulationChangedEventListener.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /** diff --git a/src/javaeva/server/go/InterfaceProcessor.java b/src/eva2/server/go/InterfaceProcessor.java similarity index 97% rename from src/javaeva/server/go/InterfaceProcessor.java rename to src/eva2/server/go/InterfaceProcessor.java index 06f62978..75dd786c 100644 --- a/src/javaeva/server/go/InterfaceProcessor.java +++ b/src/eva2/server/go/InterfaceProcessor.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; import wsi.ra.jproxy.RemoteStateListener; diff --git a/src/javaeva/server/go/InterfaceTerminator.java b/src/eva2/server/go/InterfaceTerminator.java similarity index 97% rename from src/javaeva/server/go/InterfaceTerminator.java rename to src/eva2/server/go/InterfaceTerminator.java index ab5e506c..dfcbb4df 100644 --- a/src/javaeva/server/go/InterfaceTerminator.java +++ b/src/eva2/server/go/InterfaceTerminator.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/server/go/MOCCOStandalone.java b/src/eva2/server/go/MOCCOStandalone.java similarity index 93% rename from src/javaeva/server/go/MOCCOStandalone.java rename to src/eva2/server/go/MOCCOStandalone.java index 447f30ae..b49900f2 100644 --- a/src/javaeva/server/go/MOCCOStandalone.java +++ b/src/eva2/server/go/MOCCOStandalone.java @@ -1,36 +1,38 @@ -package javaeva.server.go; +package eva2.server.go; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.mocco.InterfaceProcessElement; -import javaeva.server.go.mocco.MOCCOChooseMOStrategy; -import javaeva.server.go.mocco.MOCCOChooseReferencePoint; -import javaeva.server.go.mocco.MOCCOChooseReferenceSolution; -import javaeva.server.go.mocco.MOCCOInitialPopulationSize; -import javaeva.server.go.mocco.MOCCOParameterizeGDF; -import javaeva.server.go.mocco.MOCCOParameterizeMO; -import javaeva.server.go.mocco.MOCCOParameterizeRefPoint; -import javaeva.server.go.mocco.MOCCOParameterizeSO; -import javaeva.server.go.mocco.MOCCOParameterizeSTEP; -import javaeva.server.go.mocco.MOCCOParameterizeTchebycheff; -import javaeva.server.go.mocco.MOCCOProblemInitialization; -import javaeva.server.go.mocco.MOCCOProblemRedefinition; -import javaeva.server.go.mocco.MOCCOState; -import javaeva.server.go.mocco.paretofrontviewer.MOCCOViewer; -import javaeva.server.go.operators.moso.InterfaceMOSOConverter; -import javaeva.server.go.operators.moso.MOSOWeightedFitness; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.problems.TF1Problem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.IslandModelEA; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.*; import javax.swing.*; + +import eva2.gui.*; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.mocco.InterfaceProcessElement; +import eva2.server.go.mocco.MOCCOChooseMOStrategy; +import eva2.server.go.mocco.MOCCOChooseReferencePoint; +import eva2.server.go.mocco.MOCCOChooseReferenceSolution; +import eva2.server.go.mocco.MOCCOInitialPopulationSize; +import eva2.server.go.mocco.MOCCOParameterizeGDF; +import eva2.server.go.mocco.MOCCOParameterizeMO; +import eva2.server.go.mocco.MOCCOParameterizeRefPoint; +import eva2.server.go.mocco.MOCCOParameterizeSO; +import eva2.server.go.mocco.MOCCOParameterizeSTEP; +import eva2.server.go.mocco.MOCCOParameterizeTchebycheff; +import eva2.server.go.mocco.MOCCOProblemInitialization; +import eva2.server.go.mocco.MOCCOProblemRedefinition; +import eva2.server.go.mocco.MOCCOState; +import eva2.server.go.mocco.paretofrontviewer.MOCCOViewer; +import eva2.server.go.operators.moso.InterfaceMOSOConverter; +import eva2.server.go.operators.moso.MOSOWeightedFitness; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.problems.TF1Problem; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.IslandModelEA; +import eva2.server.go.tools.GeneralGOEProperty; + import java.io.*; import java.awt.*; import java.awt.event.*; diff --git a/src/javaeva/server/go/MutationInterface.java b/src/eva2/server/go/MutationInterface.java similarity index 91% rename from src/javaeva/server/go/MutationInterface.java rename to src/eva2/server/go/MutationInterface.java index 34a38b81..e4970b32 100644 --- a/src/javaeva/server/go/MutationInterface.java +++ b/src/eva2/server/go/MutationInterface.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /* * Title: JavaEvA * Description: @@ -12,7 +12,7 @@ package javaeva.server.go; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.server.stat.InterfaceStatistics; +import eva2.server.stat.InterfaceStatistics; /*==========================================================================* * INTERFACE DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/go/PopulationInterface.java b/src/eva2/server/go/PopulationInterface.java similarity index 98% rename from src/javaeva/server/go/PopulationInterface.java rename to src/eva2/server/go/PopulationInterface.java index 68e3ed3a..8450edf0 100644 --- a/src/javaeva/server/go/PopulationInterface.java +++ b/src/eva2/server/go/PopulationInterface.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /* * Title: JavaEvA diff --git a/src/javaeva/server/go/SelectionInterface.java b/src/eva2/server/go/SelectionInterface.java similarity index 91% rename from src/javaeva/server/go/SelectionInterface.java rename to src/eva2/server/go/SelectionInterface.java index 100164c5..315fdb84 100644 --- a/src/javaeva/server/go/SelectionInterface.java +++ b/src/eva2/server/go/SelectionInterface.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /* * Title: JavaEvA * Description: @@ -12,7 +12,7 @@ package javaeva.server.go; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.server.stat.InterfaceStatistics; +import eva2.server.stat.InterfaceStatistics; /*==========================================================================* * INTERFACE DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/go/SwingWorker.java b/src/eva2/server/go/SwingWorker.java similarity index 99% rename from src/javaeva/server/go/SwingWorker.java rename to src/eva2/server/go/SwingWorker.java index 92cffc26..b8aafdc3 100644 --- a/src/javaeva/server/go/SwingWorker.java +++ b/src/eva2/server/go/SwingWorker.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; import javax.swing.SwingUtilities; /** diff --git a/src/javaeva/server/go/individuals/AbstractEAIndividual.java b/src/eva2/server/go/individuals/AbstractEAIndividual.java similarity index 85% rename from src/javaeva/server/go/individuals/AbstractEAIndividual.java rename to src/eva2/server/go/individuals/AbstractEAIndividual.java index b09289ce..5797ed1a 100644 --- a/src/javaeva/server/go/individuals/AbstractEAIndividual.java +++ b/src/eva2/server/go/individuals/AbstractEAIndividual.java @@ -1,21 +1,23 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.gui.BeanInspector; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; -import javaeva.server.go.operators.constraint.InterfaceConstraint; -import javaeva.server.go.operators.crossover.CrossoverGADefault; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.operators.crossover.NoCrossover; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGADefault; -import javaeva.server.go.operators.mutation.NoMutation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.GONamingBox; import java.util.ArrayList; import java.util.BitSet; +import java.util.LinkedList; +import java.util.List; + +import eva2.gui.BeanInspector; +import eva2.server.go.IndividualInterface; +import eva2.server.go.individuals.codings.gp.InterfaceProgram; +import eva2.server.go.operators.constraint.InterfaceConstraint; +import eva2.server.go.operators.crossover.InterfaceCrossover; +import eva2.server.go.operators.crossover.NoCrossover; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.NoMutation; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.GONamingBox; +import eva2.server.go.tools.RandomNumberGenerator; /** This is the abstract EA individual implementing the most important methods giving * access to mutation and crossover rates and operators, fitness values and selection @@ -33,10 +35,15 @@ import java.util.BitSet; */ public abstract class AbstractEAIndividual implements IndividualInterface, java.io.Serializable { - public int m_FunctionCalls = 0; // ist irgendwie eine Kr�cke + public int m_FunctionCalls = 0; // TODO ist irgendwie eine Kruecke protected int m_ObjectIncrement = 5; protected int m_Age = 0; - protected String m_Name = GONamingBox.getRandomName(); +// protected String m_Name = GONamingBox.getRandomName(); + + private long m_ID = 0; + private static long m_IDcounter = 0; + private int logParentLen = 10; + private LinkedList heritage = null; protected double[] m_Fitness = new double[1]; private double m_ConstraintViolation = 0; @@ -50,7 +57,17 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. protected InterfaceCrossover m_CrossoverOperator = new NoCrossover(); protected String[] m_Identifiers = new String[m_ObjectIncrement]; protected Object[] m_Objects = new Object[m_ObjectIncrement]; + + public AbstractEAIndividual() { + m_IDcounter++; + m_ID = m_IDcounter; +// System.out.println("my id is " + m_ID); + } + public long getIndyID() { + return m_ID; + } + /** This method will enable you to clone a given individual * @return The clone */ @@ -91,12 +108,13 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. * @param individual The individual to clone. */ public void cloneAEAObjects(AbstractEAIndividual individual) { - m_Name = new String(individual.m_Name); +// m_Name = new String(individual.m_Name); m_Identifiers = new String[individual.m_Identifiers.length]; m_Objects = new Object[individual.m_Identifiers.length]; m_ConstraintViolation = individual.m_ConstraintViolation; m_AreaConst4ParallelViolated = individual.m_AreaConst4ParallelViolated; m_Marked = individual.m_Marked; + if (individual.heritage != null) heritage = new LinkedList(individual.heritage); System.arraycopy(individual.m_Identifiers,0,m_Identifiers,0,individual.m_Identifiers.length); System.arraycopy(individual.m_Objects,0,m_Objects,0,individual.m_Objects.length); } @@ -152,9 +170,9 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. return "AbstractEAIndividual"; } - public String getIndividualName() { - return this.m_Name; - } +// public String getIndividualName() { +// return this.m_Name; +// } /** This method is used when a new offspring is created * the increment the name. @@ -224,15 +242,102 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. /** This method will mutate the individual randomly */ - public abstract void mutate(); - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public abstract AbstractEAIndividual[] mateWith(Population partners); + public void mutate() { + if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); + } + /** + * This method will mate the Individual with given other individuals + * of the same type with the individuals crossover probability and operator. + * The default operation is implemented here. Specialized individuals may + * override. + * + * @param partners The possible partners + * @return offsprings + */ + public AbstractEAIndividual[] mateWith(Population partners) { + AbstractEAIndividual[] result; + if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { + result = this.m_CrossoverOperator.mate(this, partners); + if (logParentLen > 0) { + for (int i = 0; i < result.length; i++) { + result[i].setParents(this, partners); + } + } + } else { + // simply return a number of perfect clones + result = new AbstractEAIndividual[partners.size() +1]; + result[0] = (AbstractEAIndividual)this.clone(); + for (int i = 0; i < partners.size(); i++) { + result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); + } + if (logParentLen > 0) { + result[0].setParent(this); + for (int i = 0; i < partners.size(); i++) { + result[i+1].setParent(partners.getEAIndividual(i)); + } + } + } +// for (int i = 0; i < result.length; i++) { +// result[i].giveNewName(); +// } + return result; + } + + /** + * Toggle the parent logging mechanism. It keeps track of the ancestor IDs of an individual + * if mutation/crossover are used. Set the desired length of logging history (generations) or + * set it to 0 to deactivate heritage logging. + * + * @param logPs + */ + public void setLogHeritagetLen(int logLen) { + logParentLen = logLen; + } + + /** + * Add an ancestor generation with multiple parents. + * + * @param parents + */ + private void setParents(AbstractEAIndividual parent, Population parents) { + if (heritage == null) heritage = new LinkedList(); + Long[] parentIDs = new Long[1+parents.size()]; + parentIDs[0] = parent.getIndyID(); + for (int i=0; i logParentLen) heritage.remove(0); + } + + /** + * Add an ancestor generation with only one parent. + * + * @param parent + */ + protected void setParent(AbstractEAIndividual parent) { + if (heritage == null) heritage = new LinkedList(); + Long[] parentID = new Long[1]; + parentID[0] = parent.getIndyID(); + addHeritage(parentID); + } + + public List getHeritageList() { + return heritage; + } + + /** + * Returns the last set of parental IDs or null if none are available. + * @return the last set of parental IDs or null if none are available + */ + public Long[] getHeritage() { + if (heritage != null) return heritage.getLast(); + else return null; + } + /** This method will allow you to get the current age of an individual * Zero means it has not even been evaluated. * @return The current age. @@ -638,7 +743,7 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. public abstract String getStringRepresentation(); /** - * This method creates a default String representation for a number Individual interfaces + * This method creates a default String representation for an AbstractEAIndividual * with genotype and fitness representation. * * @param individual The individual that is to be shown. @@ -649,6 +754,10 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. sb.append(", fitness: "); sb.append(BeanInspector.toString(individual.getFitness())); + sb.append(", ID: "); + sb.append(individual.getIndyID()); + sb.append(", parents: "); + sb.append(BeanInspector.toString(individual.getHeritage())); return sb.toString(); } @@ -741,5 +850,6 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. public boolean isDominant(IndividualInterface indy) { return isDominatingDebConstraints((AbstractEAIndividual)indy); } + } \ No newline at end of file diff --git a/src/javaeva/server/go/individuals/AbstractEAIndividualComparator.java b/src/eva2/server/go/individuals/AbstractEAIndividualComparator.java similarity index 97% rename from src/javaeva/server/go/individuals/AbstractEAIndividualComparator.java rename to src/eva2/server/go/individuals/AbstractEAIndividualComparator.java index eab91a87..e32f8e8b 100644 --- a/src/javaeva/server/go/individuals/AbstractEAIndividualComparator.java +++ b/src/eva2/server/go/individuals/AbstractEAIndividualComparator.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; import java.util.Comparator; diff --git a/src/javaeva/server/go/individuals/ESIndividualBinaryData.java b/src/eva2/server/go/individuals/ESIndividualBinaryData.java similarity index 88% rename from src/javaeva/server/go/individuals/ESIndividualBinaryData.java rename to src/eva2/server/go/individuals/ESIndividualBinaryData.java index 7305a92c..14c68979 100644 --- a/src/javaeva/server/go/individuals/ESIndividualBinaryData.java +++ b/src/eva2/server/go/individuals/ESIndividualBinaryData.java @@ -1,14 +1,14 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; import java.util.BitSet; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.operators.crossover.CrossoverESDefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESGlobal; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.IndividualInterface; +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.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a real-valued genotype to code for binary values, either * by using a threshold value of by interpreting the double value as probability. @@ -197,34 +197,6 @@ public class ESIndividualBinaryData extends AbstractEAIndividual implements Inte this.m_CrossoverOperator.init(this, opt); } - - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/ESIndividualDoubleData.java b/src/eva2/server/go/individuals/ESIndividualDoubleData.java similarity index 89% rename from src/javaeva/server/go/individuals/ESIndividualDoubleData.java rename to src/eva2/server/go/individuals/ESIndividualDoubleData.java index 50575fd4..3e577c42 100644 --- a/src/javaeva/server/go/individuals/ESIndividualDoubleData.java +++ b/src/eva2/server/go/individuals/ESIndividualDoubleData.java @@ -1,15 +1,15 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.operators.crossover.CrossoverESDefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESGlobal; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.Arrays; +import eva2.server.go.IndividualInterface; +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.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a real-valued genotype to code for double values. * Created by IntelliJ IDEA. * User: streiche @@ -222,33 +222,6 @@ public class ESIndividualDoubleData extends AbstractEAIndividual implements Inte this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/ESIndividualIntegerData.java b/src/eva2/server/go/individuals/ESIndividualIntegerData.java similarity index 88% rename from src/javaeva/server/go/individuals/ESIndividualIntegerData.java rename to src/eva2/server/go/individuals/ESIndividualIntegerData.java index 4c7745e7..488ff628 100644 --- a/src/javaeva/server/go/individuals/ESIndividualIntegerData.java +++ b/src/eva2/server/go/individuals/ESIndividualIntegerData.java @@ -1,15 +1,15 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.operators.crossover.CrossoverESDefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESGlobal; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.Arrays; +import eva2.server.go.IndividualInterface; +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.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a real-valued genotype to code for integer values. * Created by IntelliJ IDEA. * User: streiche @@ -211,33 +211,6 @@ public class ESIndividualIntegerData extends AbstractEAIndividual implements Int this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/ESIndividualPermutationData.java b/src/eva2/server/go/individuals/ESIndividualPermutationData.java similarity index 90% rename from src/javaeva/server/go/individuals/ESIndividualPermutationData.java rename to src/eva2/server/go/individuals/ESIndividualPermutationData.java index 5dc81920..36c489ae 100644 --- a/src/javaeva/server/go/individuals/ESIndividualPermutationData.java +++ b/src/eva2/server/go/individuals/ESIndividualPermutationData.java @@ -1,12 +1,11 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.operators.crossover.CrossoverESDefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESGlobal; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.IndividualInterface; +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.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** This individual uses a real-valued genotype to code for a permutations, * the sorting of the real-valued genotype gives the permutation. @@ -241,33 +240,6 @@ public class ESIndividualPermutationData extends AbstractEAIndividual implements this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/GAESIndividualBinaryDoubleData.java b/src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java similarity index 98% rename from src/javaeva/server/go/individuals/GAESIndividualBinaryDoubleData.java rename to src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java index cbe91d12..ae6e75c9 100644 --- a/src/javaeva/server/go/individuals/GAESIndividualBinaryDoubleData.java +++ b/src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java @@ -1,12 +1,13 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; 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.server.go.tools.RandomNumberGenerator; + /** This individual combines a binary and a real-valued phenotype. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/individuals/GAIndividualBinaryData.java b/src/eva2/server/go/individuals/GAIndividualBinaryData.java similarity index 84% rename from src/javaeva/server/go/individuals/GAIndividualBinaryData.java rename to src/eva2/server/go/individuals/GAIndividualBinaryData.java index fbfc5f55..6bf197ee 100644 --- a/src/javaeva/server/go/individuals/GAIndividualBinaryData.java +++ b/src/eva2/server/go/individuals/GAIndividualBinaryData.java @@ -1,19 +1,19 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.operators.crossover.CrossoverGADefault; -import javaeva.server.go.operators.crossover.CrossoverGANPoint; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.operators.crossover.NoCrossover; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGADefault; -import javaeva.server.go.operators.mutation.MutateGAStandard; -import javaeva.server.go.operators.mutation.NoMutation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.operators.crossover.CrossoverGADefault; +import eva2.server.go.operators.crossover.CrossoverGANPoint; +import eva2.server.go.operators.crossover.InterfaceCrossover; +import eva2.server.go.operators.crossover.NoCrossover; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateGADefault; +import eva2.server.go.operators.mutation.MutateGAStandard; +import eva2.server.go.operators.mutation.NoMutation; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a binary genotype to code for binary values. * Created by IntelliJ IDEA. * User: streiche @@ -121,33 +121,6 @@ public class GAIndividualBinaryData extends AbstractEAIndividual implements Inte this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method can be used to read the current fitness of the individual. * Please note that the fitness can be based on multiple criteria therefore * double[] is used instead of a single double. diff --git a/src/javaeva/server/go/individuals/GAIndividualDoubleData.java b/src/eva2/server/go/individuals/GAIndividualDoubleData.java similarity index 88% rename from src/javaeva/server/go/individuals/GAIndividualDoubleData.java rename to src/eva2/server/go/individuals/GAIndividualDoubleData.java index c2639281..7fe576ec 100644 --- a/src/javaeva/server/go/individuals/GAIndividualDoubleData.java +++ b/src/eva2/server/go/individuals/GAIndividualDoubleData.java @@ -1,19 +1,19 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.ga.GAStandardCodingDouble; -import javaeva.server.go.individuals.codings.ga.InterfaceGADoubleCoding; -import javaeva.server.go.operators.crossover.CrossoverGADefault; -import javaeva.server.go.operators.crossover.CrossoverGANPoint; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGADefault; -import javaeva.server.go.operators.mutation.MutateGAStandard; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; 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.CrossoverGADefault; +import eva2.server.go.operators.crossover.CrossoverGANPoint; +import eva2.server.go.operators.crossover.InterfaceCrossover; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateGADefault; +import eva2.server.go.operators.mutation.MutateGAStandard; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a binary genotype to code for double values * using two alternative encodings. * Created by IntelliJ IDEA. @@ -237,33 +237,6 @@ public class GAIndividualDoubleData extends AbstractEAIndividual implements Inte this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/GAIndividualIntegerData.java b/src/eva2/server/go/individuals/GAIndividualIntegerData.java similarity index 89% rename from src/javaeva/server/go/individuals/GAIndividualIntegerData.java rename to src/eva2/server/go/individuals/GAIndividualIntegerData.java index 1f54fd1c..e2872604 100644 --- a/src/javaeva/server/go/individuals/GAIndividualIntegerData.java +++ b/src/eva2/server/go/individuals/GAIndividualIntegerData.java @@ -1,18 +1,18 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.ga.GAStandardCodingDouble; -import javaeva.server.go.individuals.codings.ga.GAStandardCodingInteger; -import javaeva.server.go.individuals.codings.ga.InterfaceGADoubleCoding; -import javaeva.server.go.individuals.codings.ga.InterfaceGAIntegerCoding; -import javaeva.server.go.operators.crossover.CrossoverGANPoint; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGAStandard; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.individuals.codings.ga.GAStandardCodingDouble; +import eva2.server.go.individuals.codings.ga.GAStandardCodingInteger; +import eva2.server.go.individuals.codings.ga.InterfaceGADoubleCoding; +import eva2.server.go.individuals.codings.ga.InterfaceGAIntegerCoding; +import eva2.server.go.operators.crossover.CrossoverGANPoint; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateGAStandard; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a binary genotype to code for binary values using * two alternative encodings. * Created by IntelliJ IDEA. @@ -238,34 +238,6 @@ public class GAIndividualIntegerData extends AbstractEAIndividual implements Int this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - return result; - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/GAPIndividualProgramData.java b/src/eva2/server/go/individuals/GAPIndividualProgramData.java similarity index 94% rename from src/javaeva/server/go/individuals/GAPIndividualProgramData.java rename to src/eva2/server/go/individuals/GAPIndividualProgramData.java index d83b375a..87e0e42c 100644 --- a/src/javaeva/server/go/individuals/GAPIndividualProgramData.java +++ b/src/eva2/server/go/individuals/GAPIndividualProgramData.java @@ -1,20 +1,21 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.individuals.codings.gp.GPArea; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; -import javaeva.server.go.operators.crossover.CrossoverESDefault; -import javaeva.server.go.operators.crossover.CrossoverGPDefault; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESDefault; -import javaeva.server.go.operators.mutation.MutateGPDefault; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +import eva2.server.go.individuals.codings.gp.AbstractGPNode; +import eva2.server.go.individuals.codings.gp.GPArea; +import eva2.server.go.individuals.codings.gp.InterfaceProgram; +import eva2.server.go.operators.crossover.CrossoverESDefault; +import eva2.server.go.operators.crossover.CrossoverGPDefault; +import eva2.server.go.operators.crossover.InterfaceCrossover; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateESDefault; +import eva2.server.go.operators.mutation.MutateGPDefault; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual combines a real-valued phenotype with a tree-based phenotype. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/individuals/GEIndividualProgramData.java b/src/eva2/server/go/individuals/GEIndividualProgramData.java similarity index 94% rename from src/javaeva/server/go/individuals/GEIndividualProgramData.java rename to src/eva2/server/go/individuals/GEIndividualProgramData.java index 3e4a94ba..ec93abb4 100644 --- a/src/javaeva/server/go/individuals/GEIndividualProgramData.java +++ b/src/eva2/server/go/individuals/GEIndividualProgramData.java @@ -1,18 +1,18 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.individuals.codings.gp.GPArea; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; -import javaeva.server.go.operators.crossover.CrossoverGADefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGADefault; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; import java.util.ArrayList; +import eva2.server.go.individuals.codings.gp.AbstractGPNode; +import eva2.server.go.individuals.codings.gp.GPArea; +import eva2.server.go.individuals.codings.gp.InterfaceProgram; +import eva2.server.go.operators.crossover.CrossoverGADefault; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateGADefault; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a binary genotype to code for a tree-based representation * using a BNF grammar, see also Grammatical Evolution. * Created by IntelliJ IDEA. @@ -526,33 +526,6 @@ public class GEIndividualProgramData extends AbstractEAIndividual implements Int this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/GIIndividualIntegerData.java b/src/eva2/server/go/individuals/GIIndividualIntegerData.java similarity index 88% rename from src/javaeva/server/go/individuals/GIIndividualIntegerData.java rename to src/eva2/server/go/individuals/GIIndividualIntegerData.java index ae710444..e2646436 100644 --- a/src/javaeva/server/go/individuals/GIIndividualIntegerData.java +++ b/src/eva2/server/go/individuals/GIIndividualIntegerData.java @@ -1,11 +1,10 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.operators.crossover.CrossoverGIDefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGIDefault; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.operators.crossover.CrossoverGIDefault; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateGIDefault; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** This individual uses a integer genotype to code for integer values. * Created by IntelliJ IDEA. @@ -217,34 +216,6 @@ public class GIIndividualIntegerData extends AbstractEAIndividual implements Int this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - return result; - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java b/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java similarity index 98% rename from src/javaeva/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java rename to src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java index eccd7dd9..c322a051 100644 --- a/src/javaeva/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java +++ b/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java @@ -1,12 +1,13 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; 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.server.go.tools.RandomNumberGenerator; + /** This individual combines a binary and a real-valued phenotype. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/individuals/GPIndividualProgramData.java b/src/eva2/server/go/individuals/GPIndividualProgramData.java similarity index 88% rename from src/javaeva/server/go/individuals/GPIndividualProgramData.java rename to src/eva2/server/go/individuals/GPIndividualProgramData.java index 5ec97626..a16fd841 100644 --- a/src/javaeva/server/go/individuals/GPIndividualProgramData.java +++ b/src/eva2/server/go/individuals/GPIndividualProgramData.java @@ -1,17 +1,19 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.individuals.codings.gp.GPArea; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; -import javaeva.server.go.operators.crossover.CrossoverGPDefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGPDefault; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +import eva2.server.go.individuals.codings.gp.AbstractGPNode; +import eva2.server.go.individuals.codings.gp.GPArea; +import eva2.server.go.individuals.codings.gp.InterfaceProgram; +import eva2.server.go.operators.crossover.CrossoverGPDefault; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateGPDefault; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; +import eva2.tools.EVAERROR; +import eva2.tools.EVAHELP; + /** This individual uses a tree-based genotype to code for program trees. * Created by IntelliJ IDEA. * User: streiche @@ -31,6 +33,7 @@ public class GPIndividualProgramData extends AbstractEAIndividual implements Int public GPIndividualProgramData() { this.m_Area = new GPArea[1]; + m_Area[0] = new GPArea(); this.m_Genotype = new AbstractGPNode[1]; this.m_MutationOperator = new MutateGPDefault(); this.m_CrossoverOperator = new CrossoverGPDefault(); @@ -216,33 +219,6 @@ public class GPIndividualProgramData extends AbstractEAIndividual implements Int this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string @@ -311,8 +287,9 @@ public class GPIndividualProgramData extends AbstractEAIndividual implements Int */ public void defaultInit() { for (int i = 0; i < this.m_Area.length; i++) { - if (this.m_Area[i] == null) System.out.println("GPIndividualProgramData.defaultInit(): Area["+i+"] == null !!"); - else { + if (this.m_Area[i] == null) { + EVAERROR.errorMsgOnce("Error in GPIndividualProgramData.defaultInit(): Area["+i+"] == null !!"); + } else { this.m_Genotype[i] = (AbstractGPNode)(this.m_Area[i].getRandomNonTerminal()).clone(); this.m_Genotype[i].setDepth(0); int targetDepth = RandomNumberGenerator.randomInt(1, this.m_InitDepth); diff --git a/src/javaeva/server/go/individuals/InterfaceDataTypeBinary.java b/src/eva2/server/go/individuals/InterfaceDataTypeBinary.java similarity index 97% rename from src/javaeva/server/go/individuals/InterfaceDataTypeBinary.java rename to src/eva2/server/go/individuals/InterfaceDataTypeBinary.java index 5b4f5d14..59c86368 100644 --- a/src/javaeva/server/go/individuals/InterfaceDataTypeBinary.java +++ b/src/eva2/server/go/individuals/InterfaceDataTypeBinary.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/InterfaceDataTypeDouble.java b/src/eva2/server/go/individuals/InterfaceDataTypeDouble.java similarity index 98% rename from src/javaeva/server/go/individuals/InterfaceDataTypeDouble.java rename to src/eva2/server/go/individuals/InterfaceDataTypeDouble.java index 1c425db0..259e6e8c 100644 --- a/src/javaeva/server/go/individuals/InterfaceDataTypeDouble.java +++ b/src/eva2/server/go/individuals/InterfaceDataTypeDouble.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; /** This interface gives access to a double phenotype and except * for problemspecific operators should only be used by the diff --git a/src/javaeva/server/go/individuals/InterfaceDataTypeInteger.java b/src/eva2/server/go/individuals/InterfaceDataTypeInteger.java similarity index 97% rename from src/javaeva/server/go/individuals/InterfaceDataTypeInteger.java rename to src/eva2/server/go/individuals/InterfaceDataTypeInteger.java index 6dd85757..05e765b2 100644 --- a/src/javaeva/server/go/individuals/InterfaceDataTypeInteger.java +++ b/src/eva2/server/go/individuals/InterfaceDataTypeInteger.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; /** This interface gives access to a integer phenotype and except * for problemspecific operators should only be used by the diff --git a/src/javaeva/server/go/individuals/InterfaceDataTypePermutation.java b/src/eva2/server/go/individuals/InterfaceDataTypePermutation.java similarity index 97% rename from src/javaeva/server/go/individuals/InterfaceDataTypePermutation.java rename to src/eva2/server/go/individuals/InterfaceDataTypePermutation.java index 273c9e5f..25746a18 100644 --- a/src/javaeva/server/go/individuals/InterfaceDataTypePermutation.java +++ b/src/eva2/server/go/individuals/InterfaceDataTypePermutation.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; /** This interface gives access to a permutation phenotype and except diff --git a/src/javaeva/server/go/individuals/InterfaceDataTypeProgram.java b/src/eva2/server/go/individuals/InterfaceDataTypeProgram.java similarity index 94% rename from src/javaeva/server/go/individuals/InterfaceDataTypeProgram.java rename to src/eva2/server/go/individuals/InterfaceDataTypeProgram.java index 09170868..b2400585 100644 --- a/src/javaeva/server/go/individuals/InterfaceDataTypeProgram.java +++ b/src/eva2/server/go/individuals/InterfaceDataTypeProgram.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; +import eva2.server.go.individuals.codings.gp.InterfaceProgram; /** This interface gives access to a program phenotype and except * for problemspecific operators should only be used by the diff --git a/src/javaeva/server/go/individuals/InterfaceESIndividual.java b/src/eva2/server/go/individuals/InterfaceESIndividual.java similarity index 97% rename from src/javaeva/server/go/individuals/InterfaceESIndividual.java rename to src/eva2/server/go/individuals/InterfaceESIndividual.java index f7e03ef6..5544c588 100644 --- a/src/javaeva/server/go/individuals/InterfaceESIndividual.java +++ b/src/eva2/server/go/individuals/InterfaceESIndividual.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; /** This interface gives access to a real-valued genotype and should * only be used by mutation and crossover operators. Onyl exception are diff --git a/src/javaeva/server/go/individuals/InterfaceGAIndividual.java b/src/eva2/server/go/individuals/InterfaceGAIndividual.java similarity index 97% rename from src/javaeva/server/go/individuals/InterfaceGAIndividual.java rename to src/eva2/server/go/individuals/InterfaceGAIndividual.java index 6f861348..73361a27 100644 --- a/src/javaeva/server/go/individuals/InterfaceGAIndividual.java +++ b/src/eva2/server/go/individuals/InterfaceGAIndividual.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/InterfaceGIIndividual.java b/src/eva2/server/go/individuals/InterfaceGIIndividual.java similarity index 98% rename from src/javaeva/server/go/individuals/InterfaceGIIndividual.java rename to src/eva2/server/go/individuals/InterfaceGIIndividual.java index 8f81bba3..4efd0ece 100644 --- a/src/javaeva/server/go/individuals/InterfaceGIIndividual.java +++ b/src/eva2/server/go/individuals/InterfaceGIIndividual.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/InterfaceGPIndividual.java b/src/eva2/server/go/individuals/InterfaceGPIndividual.java similarity index 92% rename from src/javaeva/server/go/individuals/InterfaceGPIndividual.java rename to src/eva2/server/go/individuals/InterfaceGPIndividual.java index 840cb2f9..b6751617 100644 --- a/src/javaeva/server/go/individuals/InterfaceGPIndividual.java +++ b/src/eva2/server/go/individuals/InterfaceGPIndividual.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; +import eva2.server.go.individuals.codings.gp.AbstractGPNode; /** This interface gives access to a tree-based genotype and should * only be used by mutation and crossover operators. diff --git a/src/javaeva/server/go/individuals/InterfaceOBGAIndividual.java b/src/eva2/server/go/individuals/InterfaceOBGAIndividual.java similarity index 95% rename from src/javaeva/server/go/individuals/InterfaceOBGAIndividual.java rename to src/eva2/server/go/individuals/InterfaceOBGAIndividual.java index d4eced4f..87271113 100644 --- a/src/javaeva/server/go/individuals/InterfaceOBGAIndividual.java +++ b/src/eva2/server/go/individuals/InterfaceOBGAIndividual.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; /** This interface gives access to a permutation genotype and should * only be used by mutation and crossover operators. diff --git a/src/javaeva/server/go/individuals/OBGAIndividualPermutationData.java b/src/eva2/server/go/individuals/OBGAIndividualPermutationData.java similarity index 81% rename from src/javaeva/server/go/individuals/OBGAIndividualPermutationData.java rename to src/eva2/server/go/individuals/OBGAIndividualPermutationData.java index b10f67ec..1bc073d1 100644 --- a/src/javaeva/server/go/individuals/OBGAIndividualPermutationData.java +++ b/src/eva2/server/go/individuals/OBGAIndividualPermutationData.java @@ -1,14 +1,14 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.operators.crossover.CrossoverOBGAPMX; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateOBGAFlip; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; 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.server.go.tools.RandomNumberGenerator; + /** This individual uses a permutation based genotype to code for * permutations. *

Title: The JavaEvA

@@ -113,44 +113,7 @@ public class OBGAIndividualPermutationData extends AbstractEAIndividual implemen this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) { - /*System.out.println("BEFORE: " +getStringRepresentation());*/ - this.m_MutationOperator.mutate(this); - /*System.out.println("AFTER: " +getStringRepresentation());*/ - } - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - /** System.out.println("BEFORE CROSSOVER"); - System.out.println(this.getStringRepresentation()); - System.out.println(((OBGAIndividualPermutationData) partners.get(0)).getStringRepresentation());*/ - result = this.m_CrossoverOperator.mate(this, partners); - /** System.out.println("AFTER CROSSOVER"); - System.out.println(this.getStringRepresentation()); - System.out.println(((OBGAIndividualPermutationData) partners.get(0)).getStringRepresentation());*/ - } else { - result = new AbstractEAIndividual[partners.size() + 1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i + 1] = (AbstractEAIndividual) ( (AbstractEAIndividual) partners.get(i)).clone(); - } - - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - - /** This method can be used to read the current fitness of the individual. + /** This method can be used to read the current fitness of the individual. * Please note that the fitness can be based on multiple criteria therefore * double[] is used instead of a single double. * @return The complete fitness array diff --git a/src/javaeva/server/go/individuals/codings/ga/GAGrayCodingDouble.java b/src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java similarity index 97% rename from src/javaeva/server/go/individuals/codings/ga/GAGrayCodingDouble.java rename to src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java index 724bd220..16c723a9 100644 --- a/src/javaeva/server/go/individuals/codings/ga/GAGrayCodingDouble.java +++ b/src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java @@ -1,9 +1,10 @@ -package javaeva.server.go.individuals.codings.ga; +package eva2.server.go.individuals.codings.ga; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.tools.RandomNumberGenerator; + /** This gives the gray coding for double with a variable number of bits for coding * As far as i recall the least significant bit is to the left. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/ga/GAGrayCodingInteger.java b/src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java similarity index 98% rename from src/javaeva/server/go/individuals/codings/ga/GAGrayCodingInteger.java rename to src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java index 381ad4cc..c7627b97 100644 --- a/src/javaeva/server/go/individuals/codings/ga/GAGrayCodingInteger.java +++ b/src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals.codings.ga; +package eva2.server.go.individuals.codings.ga; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/codings/ga/GAStandardCodingDouble.java b/src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java similarity index 99% rename from src/javaeva/server/go/individuals/codings/ga/GAStandardCodingDouble.java rename to src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java index ebd443f4..1c35b732 100644 --- a/src/javaeva/server/go/individuals/codings/ga/GAStandardCodingDouble.java +++ b/src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals.codings.ga; +package eva2.server.go.individuals.codings.ga; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/codings/ga/GAStandardCodingInteger.java b/src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java similarity index 98% rename from src/javaeva/server/go/individuals/codings/ga/GAStandardCodingInteger.java rename to src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java index cf1ea1ff..b7d457a6 100644 --- a/src/javaeva/server/go/individuals/codings/ga/GAStandardCodingInteger.java +++ b/src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java @@ -1,9 +1,10 @@ -package javaeva.server.go.individuals.codings.ga; +package eva2.server.go.individuals.codings.ga; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.tools.RandomNumberGenerator; + /** The traditional binary coding for integer number, no variable number of bits here, sorry. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java b/src/eva2/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java similarity index 96% rename from src/javaeva/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java rename to src/eva2/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java index fb5a19f4..9dd075ae 100644 --- a/src/javaeva/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java +++ b/src/eva2/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals.codings.ga; +package eva2.server.go.individuals.codings.ga; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java b/src/eva2/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java similarity index 97% rename from src/javaeva/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java rename to src/eva2/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java index 0f8dad74..3d0be3a7 100644 --- a/src/javaeva/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java +++ b/src/eva2/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals.codings.ga; +package eva2.server.go.individuals.codings.ga; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/codings/gp/AbstractGPNode.java b/src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java similarity index 98% rename from src/javaeva/server/go/individuals/codings/gp/AbstractGPNode.java rename to src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java index 7d921d84..10d6372e 100644 --- a/src/javaeva/server/go/individuals/codings/gp/AbstractGPNode.java +++ b/src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java @@ -1,9 +1,10 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; import java.util.ArrayList; +import eva2.server.go.problems.InterfaceProgramProblem; + /** This gives an abstract node, with default functionality for get and set methods. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPArea.java b/src/eva2/server/go/individuals/codings/gp/GPArea.java similarity index 97% rename from src/javaeva/server/go/individuals/codings/gp/GPArea.java rename to src/eva2/server/go/individuals/codings/gp/GPArea.java index 2ce0dcbb..87f36052 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPArea.java +++ b/src/eva2/server/go/individuals/codings/gp/GPArea.java @@ -1,9 +1,10 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +import eva2.server.go.tools.RandomNumberGenerator; + /** 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. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeAdd.java b/src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeAdd.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java index 9c57669a..f4d0041a 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeAdd.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java @@ -1,9 +1,10 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; import java.util.ArrayList; +import eva2.server.go.problems.InterfaceProgramProblem; + /** A simple add node with two arguments. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeCos.java b/src/eva2/server/go/individuals/codings/gp/GPNodeCos.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeCos.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeCos.java index 24188908..53d70e16 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeCos.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeCos.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** A cos node with on argument. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeDiv.java b/src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java similarity index 96% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeDiv.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java index 4a516ee3..4ccda857 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeDiv.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** A division node with two arguments and secure division. If diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeExp.java b/src/eva2/server/go/individuals/codings/gp/GPNodeExp.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeExp.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeExp.java index f571b0d7..aa4f3168 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeExp.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeExp.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** An exponent node with one argument. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeFlowExec2.java b/src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec2.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeFlowExec2.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec2.java index 12233fc0..4d229c8e 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeFlowExec2.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec2.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** This nodes executes both arguments. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeFlowExec3.java b/src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec3.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeFlowExec3.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec3.java index 1e03f425..fb61bc23 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeFlowExec3.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec3.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** This node executes all three arguments. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeInput.java b/src/eva2/server/go/individuals/codings/gp/GPNodeInput.java similarity index 96% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeInput.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeInput.java index 5172419f..30ec843f 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeInput.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeInput.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** This node is able to read a sensor value from the environment (e.g. the * problem) the sensor to read is given by the identifier and has to be diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeMult.java b/src/eva2/server/go/individuals/codings/gp/GPNodeMult.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeMult.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeMult.java index 994f4cc3..403c545a 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeMult.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeMult.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** A multiplicator node taking to arguments. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeOutput.java b/src/eva2/server/go/individuals/codings/gp/GPNodeOutput.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeOutput.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeOutput.java index 997b354f..999f49e2 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeOutput.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeOutput.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** The node allows the program to give an output or to perform an action * in the enviroment simulated in the problem. The type of action is given diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodePow2.java b/src/eva2/server/go/individuals/codings/gp/GPNodePow2.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodePow2.java rename to src/eva2/server/go/individuals/codings/gp/GPNodePow2.java index 1ae1d0f3..cb7faa05 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodePow2.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodePow2.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** This node puts the argument to the power of two. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodePow3.java b/src/eva2/server/go/individuals/codings/gp/GPNodePow3.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodePow3.java rename to src/eva2/server/go/individuals/codings/gp/GPNodePow3.java index 7f6a8e19..2cc59fc0 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodePow3.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodePow3.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** This argument puts the argument to the power of three. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeSin.java b/src/eva2/server/go/individuals/codings/gp/GPNodeSin.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeSin.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeSin.java index 7427bc32..e0418a47 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeSin.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeSin.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** A sinus node taking one argument. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeSqrt.java b/src/eva2/server/go/individuals/codings/gp/GPNodeSqrt.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeSqrt.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeSqrt.java index 329e7c3f..74aff88c 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeSqrt.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeSqrt.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** A square root node taking one argument. Secure operation is guaranteed * by using the absolute value only. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeSub.java b/src/eva2/server/go/individuals/codings/gp/GPNodeSub.java similarity index 96% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeSub.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeSub.java index 0e46f06e..c836aafa 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeSub.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeSub.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** A substraction node using two arguments. diff --git a/src/javaeva/server/go/individuals/codings/gp/InterfaceProgram.java b/src/eva2/server/go/individuals/codings/gp/InterfaceProgram.java similarity index 78% rename from src/javaeva/server/go/individuals/codings/gp/InterfaceProgram.java rename to src/eva2/server/go/individuals/codings/gp/InterfaceProgram.java index 9cb553e5..3e239b69 100644 --- a/src/javaeva/server/go/individuals/codings/gp/InterfaceProgram.java +++ b/src/eva2/server/go/individuals/codings/gp/InterfaceProgram.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; /** * Created by IntelliJ IDEA. @@ -13,7 +13,7 @@ public interface InterfaceProgram { * using the getSensorValue and setActuatorValue methods. * @param environment */ - public Object evaluate(javaeva.server.go.problems.InterfaceProgramProblem environment); + public Object evaluate(eva2.server.go.problems.InterfaceProgramProblem environment); /** This method returns a string representation of the current program. * @return string diff --git a/src/javaeva/server/go/mocco/InterfaceProcessElement.java b/src/eva2/server/go/mocco/InterfaceProcessElement.java similarity index 93% rename from src/javaeva/server/go/mocco/InterfaceProcessElement.java rename to src/eva2/server/go/mocco/InterfaceProcessElement.java index f3e1b629..524e4ab6 100644 --- a/src/javaeva/server/go/mocco/InterfaceProcessElement.java +++ b/src/eva2/server/go/mocco/InterfaceProcessElement.java @@ -1,4 +1,4 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/mocco/MOCCOChooseMOStrategy.java b/src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java similarity index 99% rename from src/javaeva/server/go/mocco/MOCCOChooseMOStrategy.java rename to src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java index df4d6c91..e4905cc4 100644 --- a/src/javaeva/server/go/mocco/MOCCOChooseMOStrategy.java +++ b/src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java @@ -1,8 +1,10 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; import javax.swing.*; + +import eva2.server.go.MOCCOStandalone; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOChooseReferencePoint.java b/src/eva2/server/go/mocco/MOCCOChooseReferencePoint.java similarity index 94% rename from src/javaeva/server/go/mocco/MOCCOChooseReferencePoint.java rename to src/eva2/server/go/mocco/MOCCOChooseReferencePoint.java index a0303113..e35de1d1 100644 --- a/src/javaeva/server/go/mocco/MOCCOChooseReferencePoint.java +++ b/src/eva2/server/go/mocco/MOCCOChooseReferencePoint.java @@ -1,11 +1,13 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.mocco.paretofrontviewer.InterfaceRefPointListener; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; import javax.swing.*; + +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.mocco.paretofrontviewer.InterfaceRefPointListener; +import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.server.go.problems.InterfaceOptimizationObjective; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOChooseReferenceSolution.java b/src/eva2/server/go/mocco/MOCCOChooseReferenceSolution.java similarity index 93% rename from src/javaeva/server/go/mocco/MOCCOChooseReferenceSolution.java rename to src/eva2/server/go/mocco/MOCCOChooseReferenceSolution.java index bce6bceb..9aa56452 100644 --- a/src/javaeva/server/go/mocco/MOCCOChooseReferenceSolution.java +++ b/src/eva2/server/go/mocco/MOCCOChooseReferenceSolution.java @@ -1,13 +1,15 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; import javax.swing.*; + +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.server.go.problems.InterfaceOptimizationObjective; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOInitialPopulationSize.java b/src/eva2/server/go/mocco/MOCCOInitialPopulationSize.java similarity index 94% rename from src/javaeva/server/go/mocco/MOCCOInitialPopulationSize.java rename to src/eva2/server/go/mocco/MOCCOInitialPopulationSize.java index 8446d89d..77d096bf 100644 --- a/src/javaeva/server/go/mocco/MOCCOInitialPopulationSize.java +++ b/src/eva2/server/go/mocco/MOCCOInitialPopulationSize.java @@ -1,10 +1,12 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.gui.JParaPanel; import javax.swing.*; + +import eva2.gui.JParaPanel; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.problems.InterfaceOptimizationProblem; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOParameterizeGDF.java b/src/eva2/server/go/mocco/MOCCOParameterizeGDF.java similarity index 93% rename from src/javaeva/server/go/mocco/MOCCOParameterizeGDF.java rename to src/eva2/server/go/mocco/MOCCOParameterizeGDF.java index ba27a8dd..54ad67cb 100644 --- a/src/javaeva/server/go/mocco/MOCCOParameterizeGDF.java +++ b/src/eva2/server/go/mocco/MOCCOParameterizeGDF.java @@ -1,20 +1,22 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.moso.MOSOWeightedFitness; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.PropertyDoubleArray; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.PropertyEditorProvider; import javax.swing.*; + +import eva2.gui.GenericObjectEditor; +import eva2.gui.PropertyDoubleArray; +import eva2.gui.PropertyEditorProvider; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.moso.MOSOWeightedFitness; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.tools.GeneralGOEProperty; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOParameterizeMO.java b/src/eva2/server/go/mocco/MOCCOParameterizeMO.java similarity index 93% rename from src/javaeva/server/go/mocco/MOCCOParameterizeMO.java rename to src/eva2/server/go/mocco/MOCCOParameterizeMO.java index 86db7744..e5ca1d91 100644 --- a/src/javaeva/server/go/mocco/MOCCOParameterizeMO.java +++ b/src/eva2/server/go/mocco/MOCCOParameterizeMO.java @@ -1,16 +1,18 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.PropertyEditorProvider; import javax.swing.*; + +import eva2.gui.GenericObjectEditor; +import eva2.gui.PropertyEditorProvider; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.populations.Population; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.MultiObjectiveEA; +import eva2.server.go.tools.GeneralGOEProperty; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOParameterizeRefPoint.java b/src/eva2/server/go/mocco/MOCCOParameterizeRefPoint.java similarity index 95% rename from src/javaeva/server/go/mocco/MOCCOParameterizeRefPoint.java rename to src/eva2/server/go/mocco/MOCCOParameterizeRefPoint.java index 159cea23..83e6ca5d 100644 --- a/src/javaeva/server/go/mocco/MOCCOParameterizeRefPoint.java +++ b/src/eva2/server/go/mocco/MOCCOParameterizeRefPoint.java @@ -1,18 +1,20 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.migration.SOBestMigration; -import javaeva.server.go.operators.moso.MOSOLpMetric; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.strategies.IslandModelEA; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.PropertyEditorProvider; -import javaeva.gui.PropertyRemoteServers; -import javaeva.gui.GenericObjectEditor; import javax.swing.*; + +import eva2.gui.GenericObjectEditor; +import eva2.gui.PropertyEditorProvider; +import eva2.gui.PropertyRemoteServers; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.operators.migration.SOBestMigration; +import eva2.server.go.operators.moso.MOSOLpMetric; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.strategies.IslandModelEA; +import eva2.server.go.tools.GeneralGOEProperty; +import eva2.server.go.tools.RandomNumberGenerator; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOParameterizeSO.java b/src/eva2/server/go/mocco/MOCCOParameterizeSO.java similarity index 92% rename from src/javaeva/server/go/mocco/MOCCOParameterizeSO.java rename to src/eva2/server/go/mocco/MOCCOParameterizeSO.java index 909479c9..ea7dedc0 100644 --- a/src/javaeva/server/go/mocco/MOCCOParameterizeSO.java +++ b/src/eva2/server/go/mocco/MOCCOParameterizeSO.java @@ -1,15 +1,17 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.PropertyEditorProvider; import javax.swing.*; + +import eva2.gui.GenericObjectEditor; +import eva2.gui.PropertyEditorProvider; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.MultiObjectiveEA; +import eva2.server.go.tools.GeneralGOEProperty; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOParameterizeSTEP.java b/src/eva2/server/go/mocco/MOCCOParameterizeSTEP.java similarity index 95% rename from src/javaeva/server/go/mocco/MOCCOParameterizeSTEP.java rename to src/eva2/server/go/mocco/MOCCOParameterizeSTEP.java index 5233d3d0..35186855 100644 --- a/src/javaeva/server/go/mocco/MOCCOParameterizeSTEP.java +++ b/src/eva2/server/go/mocco/MOCCOParameterizeSTEP.java @@ -1,20 +1,22 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.moso.MOSOWeightedFitness; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.PropertyDoubleArray; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.PropertyEditorProvider; import javax.swing.*; + +import eva2.gui.GenericObjectEditor; +import eva2.gui.PropertyDoubleArray; +import eva2.gui.PropertyEditorProvider; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.moso.MOSOWeightedFitness; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.tools.GeneralGOEProperty; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOParameterizeTchebycheff.java b/src/eva2/server/go/mocco/MOCCOParameterizeTchebycheff.java similarity index 95% rename from src/javaeva/server/go/mocco/MOCCOParameterizeTchebycheff.java rename to src/eva2/server/go/mocco/MOCCOParameterizeTchebycheff.java index f3b0606a..ee7ce8ec 100644 --- a/src/javaeva/server/go/mocco/MOCCOParameterizeTchebycheff.java +++ b/src/eva2/server/go/mocco/MOCCOParameterizeTchebycheff.java @@ -1,18 +1,20 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.migration.SOBestMigration; -import javaeva.server.go.operators.moso.MOSOWeightedLPTchebycheff; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.strategies.IslandModelEA; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.PropertyEditorProvider; -import javaeva.gui.PropertyRemoteServers; -import javaeva.gui.GenericObjectEditor; import javax.swing.*; + +import eva2.gui.GenericObjectEditor; +import eva2.gui.PropertyEditorProvider; +import eva2.gui.PropertyRemoteServers; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.operators.migration.SOBestMigration; +import eva2.server.go.operators.moso.MOSOWeightedLPTchebycheff; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.strategies.IslandModelEA; +import eva2.server.go.tools.GeneralGOEProperty; +import eva2.server.go.tools.RandomNumberGenerator; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOPhase.java b/src/eva2/server/go/mocco/MOCCOPhase.java similarity index 94% rename from src/javaeva/server/go/mocco/MOCCOPhase.java rename to src/eva2/server/go/mocco/MOCCOPhase.java index c8d8fd5d..6c346cf3 100644 --- a/src/javaeva/server/go/mocco/MOCCOPhase.java +++ b/src/eva2/server/go/mocco/MOCCOPhase.java @@ -1,22 +1,23 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; import java.awt.BorderLayout; import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import javaeva.gui.PropertyBoolSelector; -import javaeva.gui.PropertyPanel; -import javaeva.gui.PropertyText; -import javaeva.gui.PropertyValueSelector; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.tools.GeneralGOEProperty; import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JTextArea; +import eva2.gui.PropertyBoolSelector; +import eva2.gui.PropertyPanel; +import eva2.gui.PropertyText; +import eva2.gui.PropertyValueSelector; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.tools.GeneralGOEProperty; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/mocco/MOCCOProblemInitialization.java b/src/eva2/server/go/mocco/MOCCOProblemInitialization.java similarity index 87% rename from src/javaeva/server/go/mocco/MOCCOProblemInitialization.java rename to src/eva2/server/go/mocco/MOCCOProblemInitialization.java index 813611f9..6720f8bd 100644 --- a/src/javaeva/server/go/mocco/MOCCOProblemInitialization.java +++ b/src/eva2/server/go/mocco/MOCCOProblemInitialization.java @@ -1,14 +1,16 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.tools.ReflectPackage; -import javaeva.gui.JParaPanel; -import javaeva.gui.GenericObjectEditor; import javax.swing.*; + +import eva2.gui.GenericObjectEditor; +import eva2.gui.JParaPanel; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.GeneralGOEProperty; +import eva2.tools.ReflectPackage; + import java.awt.event.ActionListener; import java.awt.event.ActionEvent; import java.awt.*; @@ -57,7 +59,7 @@ public class MOCCOProblemInitialization extends MOCCOPhase implements InterfaceP // this.m_ProblemChooser.setModel(new DefaultComboBoxModel(this.getClassAlternatives4("javaeva.server.oa.go.OptimizationProblems.InterfaceMultiObjectiveDeNovoProblem"))); Class[] altern = null; try { - altern = ReflectPackage.getAssignableClassesInPackage("javaeva.server.oa.go.OptimizationProblems", Class.forName("javaeva.server.oa.go.OptimizationProblems.InterfaceMultiObjectiveDeNovoProblem"), true, true); + altern = ReflectPackage.getAssignableClassesInPackage("eva2.server.oa.go.OptimizationProblems", Class.forName("eva2.server.oa.go.OptimizationProblems.InterfaceMultiObjectiveDeNovoProblem"), true, true); } catch (ClassNotFoundException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/javaeva/server/go/mocco/MOCCOProblemRedefinition.java b/src/eva2/server/go/mocco/MOCCOProblemRedefinition.java similarity index 95% rename from src/javaeva/server/go/mocco/MOCCOProblemRedefinition.java rename to src/eva2/server/go/mocco/MOCCOProblemRedefinition.java index 22039eae..b5889b08 100644 --- a/src/javaeva/server/go/mocco/MOCCOProblemRedefinition.java +++ b/src/eva2/server/go/mocco/MOCCOProblemRedefinition.java @@ -1,10 +1,12 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.gui.JParaPanel; import javax.swing.*; + +import eva2.gui.JParaPanel; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.problems.InterfaceOptimizationProblem; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOState.java b/src/eva2/server/go/mocco/MOCCOState.java similarity index 93% rename from src/javaeva/server/go/mocco/MOCCOState.java rename to src/eva2/server/go/mocco/MOCCOState.java index 9ad1a951..1732d795 100644 --- a/src/javaeva/server/go/mocco/MOCCOState.java +++ b/src/eva2/server/go/mocco/MOCCOState.java @@ -1,19 +1,21 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; import javax.swing.*; + +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingAllDominating; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.MultiObjectiveEA; + import java.util.ArrayList; import java.awt.*; import java.awt.event.ActionListener; diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java b/src/eva2/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java similarity index 88% rename from src/javaeva/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java rename to src/eva2/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java index 8871be31..3aedf460 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java @@ -1,4 +1,4 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java b/src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java similarity index 88% rename from src/javaeva/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java rename to src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java index 597121c9..d9a6e453 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java @@ -1,4 +1,4 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java b/src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java similarity index 79% rename from src/javaeva/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java rename to src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java index f6d13e03..120d77e4 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java @@ -1,6 +1,6 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividual; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/MOCCOViewer.java b/src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java similarity index 98% rename from src/javaeva/server/go/mocco/paretofrontviewer/MOCCOViewer.java rename to src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java index abe8531e..bbc25cc8 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/MOCCOViewer.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java @@ -1,16 +1,18 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.gui.FunctionArea; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointContentSelectable; -import javaeva.gui.InterfaceDPointWithContent; import javax.swing.*; + +import eva2.gui.Chart2DDPointContentSelectable; +import eva2.gui.FunctionArea; +import eva2.gui.GraphPointSet; +import eva2.gui.InterfaceDPointWithContent; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.server.go.problems.InterfaceOptimizationObjective; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java similarity index 98% rename from src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java rename to src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java index 90957839..f601c4f5 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java @@ -1,12 +1,14 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; -import javaeva.gui.*; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; import javax.swing.*; + +import eva2.gui.*; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.server.go.problems.InterfaceOptimizationObjective; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java similarity index 92% rename from src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java rename to src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java index 8297bd0c..a59f55e0 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java @@ -1,4 +1,4 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; import javax.swing.*; diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java similarity index 98% rename from src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java rename to src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java index 896dcb77..ead04483 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java @@ -1,13 +1,14 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; -import javaeva.gui.*; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; import javax.swing.*; +import eva2.gui.*; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.server.go.problems.InterfaceOptimizationObjective; + import wsi.ra.chart2d.ScaledBorder; import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DPointIcon; diff --git a/src/javaeva/server/go/operators/archiving/AbstractArchiving.java b/src/eva2/server/go/operators/archiving/AbstractArchiving.java similarity index 95% rename from src/javaeva/server/go/operators/archiving/AbstractArchiving.java rename to src/eva2/server/go/operators/archiving/AbstractArchiving.java index 412cb144..c7eca643 100644 --- a/src/javaeva/server/go/operators/archiving/AbstractArchiving.java +++ b/src/eva2/server/go/operators/archiving/AbstractArchiving.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.populations.Population; -import javaeva.gui.*; +import eva2.gui.*; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.populations.Population; import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DPointIcon; @@ -19,7 +19,7 @@ import wsi.ra.chart2d.DPointIcon; public abstract class AbstractArchiving implements InterfaceArchiving, java.io.Serializable { protected boolean m_Debug = false; - transient protected javaeva.gui.Plot m_Plot = null; + transient protected eva2.gui.Plot m_Plot = null; protected int p = 0; public boolean m_ObeyDebsConstViolationPrinciple = true; diff --git a/src/javaeva/server/go/operators/archiving/ArchivingAllDominating.java b/src/eva2/server/go/operators/archiving/ArchivingAllDominating.java similarity index 94% rename from src/javaeva/server/go/operators/archiving/ArchivingAllDominating.java rename to src/eva2/server/go/operators/archiving/ArchivingAllDominating.java index bfa7cd20..abe4496e 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingAllDominating.java +++ b/src/eva2/server/go/operators/archiving/ArchivingAllDominating.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.selection.SelectBestIndividuals; +import eva2.server.go.populations.Population; /** This simple strategy simply archives all Pareto optimal solutions. This method is * very prone to OutOfMemory errors! diff --git a/src/javaeva/server/go/operators/archiving/ArchivingMOMAIIAllDominating.java b/src/eva2/server/go/operators/archiving/ArchivingMOMAIIAllDominating.java similarity index 94% rename from src/javaeva/server/go/operators/archiving/ArchivingMOMAIIAllDominating.java rename to src/eva2/server/go/operators/archiving/ArchivingMOMAIIAllDominating.java index a24a9068..0c1e4d26 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingMOMAIIAllDominating.java +++ b/src/eva2/server/go/operators/archiving/ArchivingMOMAIIAllDominating.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** This class is under construction and should be able to archive * individuals, which actually give a set of solutions. @@ -13,7 +13,7 @@ import javaeva.server.go.populations.Population; public class ArchivingMOMAIIAllDominating implements InterfaceArchiving, java.io.Serializable { protected boolean m_Debug = false; - transient protected javaeva.gui.Plot m_Plot = null; + transient protected eva2.gui.Plot m_Plot = null; protected int p = 0; public ArchivingMOMAIIAllDominating() { diff --git a/src/javaeva/server/go/operators/archiving/ArchivingMaxiMin.java b/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java similarity index 95% rename from src/javaeva/server/go/operators/archiving/ArchivingMaxiMin.java rename to src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java index f9bd80ab..c1c579df 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingMaxiMin.java +++ b/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.moso.MOSOMaxiMin; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.populations.Population; -import javaeva.gui.Chart2DDPointIconCross; import java.util.ArrayList; +import eva2.gui.Chart2DDPointIconCross; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.moso.MOSOMaxiMin; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectBestIndividuals; +import eva2.server.go.populations.Population; + import wsi.ra.chart2d.DPointIcon; /** Another simple archiving strategy not based on dominace but on the MaxiMin diff --git a/src/javaeva/server/go/operators/archiving/ArchivingNSGA.java b/src/eva2/server/go/operators/archiving/ArchivingNSGA.java similarity index 94% rename from src/javaeva/server/go/operators/archiving/ArchivingNSGA.java rename to src/eva2/server/go/operators/archiving/ArchivingNSGA.java index 56a3b907..99d750bf 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingNSGA.java +++ b/src/eva2/server/go/operators/archiving/ArchivingNSGA.java @@ -1,10 +1,11 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; + /** The non dominated sorting GA archiving method, based on dominace sorting. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/archiving/ArchivingNSGAII.java b/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java similarity index 94% rename from src/javaeva/server/go/operators/archiving/ArchivingNSGAII.java rename to src/eva2/server/go/operators/archiving/ArchivingNSGAII.java index a0477c12..9b167602 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingNSGAII.java +++ b/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.*; import java.util.ArrayList; +import eva2.gui.*; +import eva2.server.go.IndividualInterface; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; + import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DPointIcon; @@ -46,7 +47,7 @@ public class ArchivingNSGAII extends ArchivingNSGA implements java.io.Serializab double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("Debug NSGAII", "Y1", "Y2", tmpD, tmpD); + this.m_Plot = new eva2.gui.Plot("Debug NSGAII", "Y1", "Y2", tmpD, tmpD); System.out.println("Population size: " + pop.size()); // plot the population this.m_Plot.setUnconnectedPoint(0, 0, 11); diff --git a/src/javaeva/server/go/operators/archiving/ArchivingPESAII.java b/src/eva2/server/go/operators/archiving/ArchivingPESAII.java similarity index 97% rename from src/javaeva/server/go/operators/archiving/ArchivingPESAII.java rename to src/eva2/server/go/operators/archiving/ArchivingPESAII.java index c66d4b18..bcb26f8a 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingPESAII.java +++ b/src/eva2/server/go/operators/archiving/ArchivingPESAII.java @@ -1,10 +1,5 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.*; import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DLine; @@ -12,6 +7,12 @@ import wsi.ra.chart2d.DLine; import java.util.ArrayList; import java.awt.*; +import eva2.gui.*; +import eva2.server.go.IndividualInterface; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; + /** The Pareto envelope sorting algorithm using a hybergrid and * the so called squezze factor. * Created by IntelliJ IDEA. @@ -47,7 +48,7 @@ public class ArchivingPESAII extends AbstractArchiving implements java.io.Serial //////////////////////////////////////////////////////////////////////////////////// if (this.m_Debug) { - this.m_Plot = new javaeva.gui.Plot("Debug SPEAII", "Y1", "Y2"); + this.m_Plot = new eva2.gui.Plot("Debug SPEAII", "Y1", "Y2"); System.out.println("Population size: " + pop.size()); // plot the population this.m_Plot.setUnconnectedPoint(0, 0, 11); diff --git a/src/javaeva/server/go/operators/archiving/ArchivingSPEAII.java b/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java similarity index 97% rename from src/javaeva/server/go/operators/archiving/ArchivingSPEAII.java rename to src/eva2/server/go/operators/archiving/ArchivingSPEAII.java index dfaccc7f..cb52fdbe 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingSPEAII.java +++ b/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java @@ -1,18 +1,19 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.operators.distancemetric.InterfaceDistanceMetric; -import javaeva.server.go.operators.distancemetric.ObjectiveSpaceMetric; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.populations.Population; -import javaeva.gui.*; import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DPointIcon; import java.awt.*; +import eva2.gui.*; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; +import eva2.server.go.operators.distancemetric.ObjectiveSpaceMetric; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectBestIndividuals; +import eva2.server.go.populations.Population; + /** The strength Pareto EA in it's second version, which is based on * dominance counts. * Created by IntelliJ IDEA. @@ -48,7 +49,7 @@ public class ArchivingSPEAII extends AbstractArchiving implements java.io.Serial //////////////////////////////////////////////////////////////////////////////////// if (this.m_Debug) { - this.m_Plot = new javaeva.gui.Plot("Debug SPEAII", "Y1", "Y2"); + this.m_Plot = new eva2.gui.Plot("Debug SPEAII", "Y1", "Y2"); System.out.println("Population size: " + pop.size()); // plot the population this.m_Plot.setUnconnectedPoint(0, 0, 11); @@ -346,7 +347,7 @@ public class ArchivingSPEAII extends AbstractArchiving implements java.io.Serial } if (this.soutDebug) { for (int i = 0; i < result.length; i++) System.out.println("Result "+i+": "+result[i]); - this.m_Plot = new javaeva.gui.Plot("Debug SPEAII", "Y1", "Y2"); + this.m_Plot = new eva2.gui.Plot("Debug SPEAII", "Y1", "Y2"); this.m_Plot.setUnconnectedPoint(0, 0, 11); this.m_Plot.setUnconnectedPoint(1.2, 2.0, 11); GraphPointSet mySet = new GraphPointSet(10, this.m_Plot.getFunctionArea()); diff --git a/src/javaeva/server/go/operators/archiving/InformationRetrievalInserting.java b/src/eva2/server/go/operators/archiving/InformationRetrievalInserting.java similarity index 95% rename from src/javaeva/server/go/operators/archiving/InformationRetrievalInserting.java rename to src/eva2/server/go/operators/archiving/InformationRetrievalInserting.java index 5f4ab7d8..68f03135 100644 --- a/src/javaeva/server/go/operators/archiving/InformationRetrievalInserting.java +++ b/src/eva2/server/go/operators/archiving/InformationRetrievalInserting.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** This information retrieval inserts the retrieved * solutions, by removing random individuals from the diff --git a/src/javaeva/server/go/operators/archiving/InformationRetrievalNone.java b/src/eva2/server/go/operators/archiving/InformationRetrievalNone.java similarity index 93% rename from src/javaeva/server/go/operators/archiving/InformationRetrievalNone.java rename to src/eva2/server/go/operators/archiving/InformationRetrievalNone.java index 46fb7783..38129f19 100644 --- a/src/javaeva/server/go/operators/archiving/InformationRetrievalNone.java +++ b/src/eva2/server/go/operators/archiving/InformationRetrievalNone.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** This class allows no information retrieval and thus no elitism * for MOEAs. diff --git a/src/javaeva/server/go/operators/archiving/InformationRetrievalReplacing.java b/src/eva2/server/go/operators/archiving/InformationRetrievalReplacing.java similarity index 92% rename from src/javaeva/server/go/operators/archiving/InformationRetrievalReplacing.java rename to src/eva2/server/go/operators/archiving/InformationRetrievalReplacing.java index 1a2b240a..5cd17ba4 100644 --- a/src/javaeva/server/go/operators/archiving/InformationRetrievalReplacing.java +++ b/src/eva2/server/go/operators/archiving/InformationRetrievalReplacing.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** This information retrieval method simply add the retrieved solutions * to the current population. diff --git a/src/javaeva/server/go/operators/archiving/InterfaceArchiving.java b/src/eva2/server/go/operators/archiving/InterfaceArchiving.java similarity index 88% rename from src/javaeva/server/go/operators/archiving/InterfaceArchiving.java rename to src/eva2/server/go/operators/archiving/InterfaceArchiving.java index 7f5c4645..cd046e71 100644 --- a/src/javaeva/server/go/operators/archiving/InterfaceArchiving.java +++ b/src/eva2/server/go/operators/archiving/InterfaceArchiving.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** This Interface give the general methods required for a archiving method. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/archiving/InterfaceInformationRetrieval.java b/src/eva2/server/go/operators/archiving/InterfaceInformationRetrieval.java similarity index 87% rename from src/javaeva/server/go/operators/archiving/InterfaceInformationRetrieval.java rename to src/eva2/server/go/operators/archiving/InterfaceInformationRetrieval.java index 4b8a5b12..cf56ddfb 100644 --- a/src/javaeva/server/go/operators/archiving/InterfaceInformationRetrieval.java +++ b/src/eva2/server/go/operators/archiving/InterfaceInformationRetrieval.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** This interface gives the necessary methods for an information * retrieval algorithm. diff --git a/src/javaeva/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java b/src/eva2/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java similarity index 87% rename from src/javaeva/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java rename to src/eva2/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java index 930e5fae..50dab8f3 100644 --- a/src/javaeva/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java +++ b/src/eva2/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** This interface gives the method necessary for an aglorithm * which is use to reduce the size of an archive. diff --git a/src/javaeva/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java b/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java similarity index 95% rename from src/javaeva/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java rename to src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java index cbc319e8..c787d291 100644 --- a/src/javaeva/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java +++ b/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** This class removes surplus individuals based on bounding * hybercube, which can be calculated in objective or decision diff --git a/src/javaeva/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java b/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java similarity index 92% rename from src/javaeva/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java rename to src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java index fa3d598e..2e749aab 100644 --- a/src/javaeva/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java +++ b/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** This class removes surplus individuals based on bounding * hybercube, which can be calculated in objective or decision diff --git a/src/javaeva/server/go/operators/classification/ClassificationSelfOrganizingMaps.java b/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java similarity index 99% rename from src/javaeva/server/go/operators/classification/ClassificationSelfOrganizingMaps.java rename to src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java index f05c0a5c..f530e766 100644 --- a/src/javaeva/server/go/operators/classification/ClassificationSelfOrganizingMaps.java +++ b/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java @@ -1,8 +1,9 @@ -package javaeva.server.go.operators.classification; +package eva2.server.go.operators.classification; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Chart2DDPointIconCross; import javax.swing.*; + +import eva2.gui.Chart2DDPointIconCross; +import eva2.server.go.tools.RandomNumberGenerator; import wsi.ra.chart2d.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; diff --git a/src/javaeva/server/go/operators/classification/InterfaceClassification.java b/src/eva2/server/go/operators/classification/InterfaceClassification.java similarity index 95% rename from src/javaeva/server/go/operators/classification/InterfaceClassification.java rename to src/eva2/server/go/operators/classification/InterfaceClassification.java index 8da2dba9..e0069b63 100644 --- a/src/javaeva/server/go/operators/classification/InterfaceClassification.java +++ b/src/eva2/server/go/operators/classification/InterfaceClassification.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.classification; +package eva2.server.go.operators.classification; /** An interface for classification methods, currently under construction. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/cluster/ClusteringDensityBased.java b/src/eva2/server/go/operators/cluster/ClusteringDensityBased.java similarity index 97% rename from src/javaeva/server/go/operators/cluster/ClusteringDensityBased.java rename to src/eva2/server/go/operators/cluster/ClusteringDensityBased.java index 3ae8de0a..166d37a1 100644 --- a/src/javaeva/server/go/operators/cluster/ClusteringDensityBased.java +++ b/src/eva2/server/go/operators/cluster/ClusteringDensityBased.java @@ -1,11 +1,12 @@ -package javaeva.server.go.operators.cluster; +package eva2.server.go.operators.cluster; import java.util.ArrayList; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.InterfaceDistanceMetric; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.server.go.populations.Population; + /** The DBSCAN method. As far as I recall this is an hierachical * clustering method like the single-link method. diff --git a/src/javaeva/server/go/operators/cluster/ClusteringKMeans.java b/src/eva2/server/go/operators/cluster/ClusteringKMeans.java similarity index 94% rename from src/javaeva/server/go/operators/cluster/ClusteringKMeans.java rename to src/eva2/server/go/operators/cluster/ClusteringKMeans.java index f961add5..5367ae93 100644 --- a/src/javaeva/server/go/operators/cluster/ClusteringKMeans.java +++ b/src/eva2/server/go/operators/cluster/ClusteringKMeans.java @@ -1,15 +1,15 @@ -package javaeva.server.go.operators.cluster; +package eva2.server.go.operators.cluster; -import javaeva.gui.Chart2DDPointIconCircle; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Plot; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +import eva2.gui.GraphPointSet; +import eva2.gui.Plot; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.tools.RandomNumberGenerator; import wsi.ra.chart2d.DPoint; /** The k-mean clustering algorithms. I guess it is not a hierachical @@ -116,7 +116,7 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("Debugging K-Means Clustering", "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("Debugging K-Means Clustering", "Y1", "Y2", tmpD, tmpD); for (int i = 0; i < pop.size(); i++) { double[] x = ((InterfaceDataTypeDouble)pop.get(i)).getDoubleData(); @@ -147,7 +147,7 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("Debugging Cluster", "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("Debugging Cluster", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; @@ -181,7 +181,7 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/javaeva/server/go/operators/cluster/ClusteringXMeans.java b/src/eva2/server/go/operators/cluster/ClusteringXMeans.java similarity index 95% rename from src/javaeva/server/go/operators/cluster/ClusteringXMeans.java rename to src/eva2/server/go/operators/cluster/ClusteringXMeans.java index b2ba82b8..8e326daa 100644 --- a/src/javaeva/server/go/operators/cluster/ClusteringXMeans.java +++ b/src/eva2/server/go/operators/cluster/ClusteringXMeans.java @@ -1,15 +1,15 @@ -package javaeva.server.go.operators.cluster; +package eva2.server.go.operators.cluster; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Plot; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +import eva2.gui.GraphPointSet; +import eva2.gui.Plot; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.tools.RandomNumberGenerator; import wsi.ra.chart2d.DPoint; /** The x-means clustering method should be able to determine a @@ -82,7 +82,7 @@ public class ClusteringXMeans implements InterfaceClustering, java.io.Serializab double[] tmpD = new double[2], x; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("K="+(i+1)+" reaches BIC = "+tmpBIC, "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("K="+(i+1)+" reaches BIC = "+tmpBIC, "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/javaeva/server/go/operators/cluster/InterfaceClustering.java b/src/eva2/server/go/operators/cluster/InterfaceClustering.java similarity index 91% rename from src/javaeva/server/go/operators/cluster/InterfaceClustering.java rename to src/eva2/server/go/operators/cluster/InterfaceClustering.java index 048e6072..f27f1438 100644 --- a/src/javaeva/server/go/operators/cluster/InterfaceClustering.java +++ b/src/eva2/server/go/operators/cluster/InterfaceClustering.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.cluster; +package eva2.server.go.operators.cluster; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * This the interface to clustering algorithms, but since there diff --git a/src/javaeva/server/go/operators/constraint/ConstBelongsToDifferentClass.java b/src/eva2/server/go/operators/constraint/ConstBelongsToDifferentClass.java similarity index 94% rename from src/javaeva/server/go/operators/constraint/ConstBelongsToDifferentClass.java rename to src/eva2/server/go/operators/constraint/ConstBelongsToDifferentClass.java index d4fa11f0..4eb31467 100644 --- a/src/javaeva/server/go/operators/constraint/ConstBelongsToDifferentClass.java +++ b/src/eva2/server/go/operators/constraint/ConstBelongsToDifferentClass.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.constraint; +package eva2.server.go.operators.constraint; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; /** This area constraint for parallelization is based on * the class type an individual belongs to. diff --git a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java similarity index 92% rename from src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java rename to src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java index 912e89f5..79143a57 100644 --- a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java +++ b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.constraint; +package eva2.server.go.operators.constraint; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividual; /** This area constraint for parallelization is based on * a line constraint diff --git a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java similarity index 95% rename from src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java rename to src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java index 4f31f494..8aa68545 100644 --- a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java +++ b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.constraint; +package eva2.server.go.operators.constraint; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividual; /** This area constraint for parallelization is based on * a surface constraint diff --git a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java similarity index 92% rename from src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java rename to src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java index 2a7f39c4..b487f87f 100644 --- a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java +++ b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.constraint; +package eva2.server.go.operators.constraint; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividual; /** This area constraint for parallelization is based on * a line constraint diff --git a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java similarity index 95% rename from src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java rename to src/eva2/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java index 10a7a78b..f423de17 100644 --- a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java +++ b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.constraint; +package eva2.server.go.operators.constraint; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividual; /** This area constraint for parallelization is based on * a surface constraint diff --git a/src/javaeva/server/go/operators/constraint/InterfaceConstraint.java b/src/eva2/server/go/operators/constraint/InterfaceConstraint.java similarity index 87% rename from src/javaeva/server/go/operators/constraint/InterfaceConstraint.java rename to src/eva2/server/go/operators/constraint/InterfaceConstraint.java index 868e7218..394d104e 100644 --- a/src/javaeva/server/go/operators/constraint/InterfaceConstraint.java +++ b/src/eva2/server/go/operators/constraint/InterfaceConstraint.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.constraint; +package eva2.server.go.operators.constraint; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividual; /** This is a interface for area constraint for parallel MOEAs * giving area constraints on the separated parts for the Pareto front. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverEAMixer.java b/src/eva2/server/go/operators/crossover/CrossoverEAMixer.java similarity index 95% rename from src/javaeva/server/go/operators/crossover/CrossoverEAMixer.java rename to src/eva2/server/go/operators/crossover/CrossoverEAMixer.java index 2e6de195..eecbfd14 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverEAMixer.java +++ b/src/eva2/server/go/operators/crossover/CrossoverEAMixer.java @@ -1,12 +1,13 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; import java.util.ArrayList; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.gui.GenericObjectEditor; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. @@ -24,7 +25,7 @@ public class CrossoverEAMixer implements InterfaceCrossover, java.io.Serializabl public CrossoverEAMixer() { InterfaceCrossover[] tmpList; - ArrayList crossers = GenericObjectEditor.getClassesFromProperties("javaeva.server.go.operators.crossover.InterfaceCrossover"); + ArrayList crossers = GenericObjectEditor.getClassesFromProperties("eva2.server.go.operators.crossover.InterfaceCrossover"); tmpList = new InterfaceCrossover[crossers.size()]; for (int i = 0; i < crossers.size(); i++) { if (((String)crossers.get(i)).equals(this.getClass().getName())) continue; diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESArithmetical.java b/src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverESArithmetical.java rename to src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java index ee434862..e04b7289 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESArithmetical.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESBLXAlpha.java b/src/eva2/server/go/operators/crossover/CrossoverESBLXAlpha.java similarity index 94% rename from src/javaeva/server/go/operators/crossover/CrossoverESBLXAlpha.java rename to src/eva2/server/go/operators/crossover/CrossoverESBLXAlpha.java index f0a5a71d..53c61090 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESBLXAlpha.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESBLXAlpha.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESDefault.java b/src/eva2/server/go/operators/crossover/CrossoverESDefault.java similarity index 87% rename from src/javaeva/server/go/operators/crossover/CrossoverESDefault.java rename to src/eva2/server/go/operators/crossover/CrossoverESDefault.java index 80bde793..9341dc07 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESDefault.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESDefault.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. @@ -29,8 +29,9 @@ public class CrossoverESDefault implements InterfaceCrossover, java.io.Serializa return new CrossoverESDefault(this); } - /** This method performs crossover on two individuals. If the individuals do - * not implement InterfaceGAIndividual, then nothing will happen. + /** + * This method performs crossover on two individuals. If the individuals do + * not implement InterfaceESIndividual, then nothing will happen. * @param indy1 The first individual * @param partners The second individual */ @@ -49,9 +50,10 @@ public class CrossoverESDefault implements InterfaceCrossover, java.io.Serializa if ((indy1 instanceof InterfaceESIndividual) && (partners.get(0) instanceof InterfaceESIndividual)) { int crossoverpoint = RandomNumberGenerator.randomInt(0,((InterfaceESIndividual)indy1).getDGenotype().length-1); boolean switcher = RandomNumberGenerator.randomBoolean(); - parents = new double[partners.size()+1][]; - children = new double[partners.size()+1][]; + parents = new double[result.length][]; + children = new double[result.length][]; for (int i = 0; i < result.length; i++) { + // first clone all data arrays parents[i] = new double[((InterfaceESIndividual)result[i]).getDGenotype().length]; children[i] = new double[parents[i].length]; System.arraycopy(((InterfaceESIndividual)result[i]).getDGenotype(), 0, parents[i], 0, parents[i].length); @@ -62,7 +64,7 @@ public class CrossoverESDefault implements InterfaceCrossover, java.io.Serializa if ((i < crossoverpoint)^(switcher)) { // do nothing } else { - // exchange + // exchange circular among the parents for (int j = 0; j < children.length-1; j++) { children[j][i] = parents[j+1][i]; } diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESFlat.java b/src/eva2/server/go/operators/crossover/CrossoverESFlat.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverESFlat.java rename to src/eva2/server/go/operators/crossover/CrossoverESFlat.java index 826bedac..d1806c50 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESFlat.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESFlat.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Plot; import javax.swing.*; +import eva2.gui.Plot; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESIntermediate.java b/src/eva2/server/go/operators/crossover/CrossoverESIntermediate.java similarity index 94% rename from src/javaeva/server/go/operators/crossover/CrossoverESIntermediate.java rename to src/eva2/server/go/operators/crossover/CrossoverESIntermediate.java index f51e5e67..51204955 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESIntermediate.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESIntermediate.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESNPointDiscrete.java b/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscrete.java similarity index 94% rename from src/javaeva/server/go/operators/crossover/CrossoverESNPointDiscrete.java rename to src/eva2/server/go/operators/crossover/CrossoverESNPointDiscrete.java index 09ec432d..43410dc8 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESNPointDiscrete.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscrete.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java b/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java similarity index 95% rename from src/javaeva/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java rename to src/eva2/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java index 8ea48d1c..a34e23c3 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESPCX.java b/src/eva2/server/go/operators/crossover/CrossoverESPCX.java similarity index 96% rename from src/javaeva/server/go/operators/crossover/CrossoverESPCX.java rename to src/eva2/server/go/operators/crossover/CrossoverESPCX.java index d9722ffe..4fcc3ee6 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESPCX.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESPCX.java @@ -1,16 +1,17 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Plot; import java.util.ArrayList; +import eva2.gui.Plot; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche @@ -329,7 +330,7 @@ public class CrossoverESPCX implements InterfaceCrossover, java.io.Serializable tmpD[0] = 1; tmpD[1] = 1; if (plotFlag) { - plot = new javaeva.gui.Plot("SBX Test", "x", "y", true); + plot = new eva2.gui.Plot("SBX Test", "x", "y", true); tmpD = indy1.getDoubleData(); plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0); tmpD = indy2.getDoubleData(); diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESSBX.java b/src/eva2/server/go/operators/crossover/CrossoverESSBX.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverESSBX.java rename to src/eva2/server/go/operators/crossover/CrossoverESSBX.java index 2326f111..0d59204a 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESSBX.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESSBX.java @@ -1,13 +1,13 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Plot; +import eva2.gui.Plot; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. @@ -145,7 +145,7 @@ public class CrossoverESSBX implements InterfaceCrossover, java.io.Serializable pop.add(indy3); tmpD[0] = 1; tmpD[1] = 1; - Plot plot = new javaeva.gui.Plot("SBX Test", "x", "y", true); + Plot plot = new eva2.gui.Plot("SBX Test", "x", "y", true); tmpD = indy1.getDoubleData(); plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0); tmpD = indy2.getDoubleData(); diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESSPX.java b/src/eva2/server/go/operators/crossover/CrossoverESSPX.java similarity index 95% rename from src/javaeva/server/go/operators/crossover/CrossoverESSPX.java rename to src/eva2/server/go/operators/crossover/CrossoverESSPX.java index 86bf5cc9..cdb85c0f 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESSPX.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESSPX.java @@ -1,16 +1,17 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Plot; import java.util.ArrayList; +import eva2.gui.Plot; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche @@ -229,7 +230,7 @@ public class CrossoverESSPX implements InterfaceCrossover, java.io.Serializable tmpD[0] = 1; tmpD[1] = 1; if (plotFlag) { - plot = new javaeva.gui.Plot("SBX Test", "x", "y", true); + plot = new eva2.gui.Plot("SBX Test", "x", "y", true); tmpD = indy1.getDoubleData(); plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0); tmpD = indy2.getDoubleData(); diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESUNDX.java b/src/eva2/server/go/operators/crossover/CrossoverESUNDX.java similarity index 96% rename from src/javaeva/server/go/operators/crossover/CrossoverESUNDX.java rename to src/eva2/server/go/operators/crossover/CrossoverESUNDX.java index 5701ec9d..2b844a80 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESUNDX.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESUNDX.java @@ -1,16 +1,17 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Plot; import java.util.ArrayList; +import eva2.gui.Plot; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche @@ -329,7 +330,7 @@ public class CrossoverESUNDX implements InterfaceCrossover, java.io.Serializable tmpD[0] = 1; tmpD[1] = 1; if (plotFlag) { - plot = new javaeva.gui.Plot("SBX Test", "x", "y", true); + plot = new eva2.gui.Plot("SBX Test", "x", "y", true); tmpD = indy1.getDoubleData(); plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0); tmpD = indy2.getDoubleData(); diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESUniformDiscrete.java b/src/eva2/server/go/operators/crossover/CrossoverESUniformDiscrete.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverESUniformDiscrete.java rename to src/eva2/server/go/operators/crossover/CrossoverESUniformDiscrete.java index d574596f..55981c20 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESUniformDiscrete.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESUniformDiscrete.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGABitSimulated.java b/src/eva2/server/go/operators/crossover/CrossoverGABitSimulated.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverGABitSimulated.java rename to src/eva2/server/go/operators/crossover/CrossoverGABitSimulated.java index af1923a3..fc01c674 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGABitSimulated.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGABitSimulated.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; 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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGADefault.java b/src/eva2/server/go/operators/crossover/CrossoverGADefault.java similarity index 92% rename from src/javaeva/server/go/operators/crossover/CrossoverGADefault.java rename to src/eva2/server/go/operators/crossover/CrossoverGADefault.java index 3a54436d..02ad1a01 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGADefault.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGADefault.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; 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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. User: streiche Date: 03.04.2003 Time: 10:34:17 To * change this template use Options | File Templates. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGANPoint.java b/src/eva2/server/go/operators/crossover/CrossoverGANPoint.java similarity index 94% rename from src/javaeva/server/go/operators/crossover/CrossoverGANPoint.java rename to src/eva2/server/go/operators/crossover/CrossoverGANPoint.java index 83f0a1a8..0f66b9f1 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGANPoint.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGANPoint.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; 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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGAUniform.java b/src/eva2/server/go/operators/crossover/CrossoverGAUniform.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverGAUniform.java rename to src/eva2/server/go/operators/crossover/CrossoverGAUniform.java index c99bd5fc..f3871b30 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGAUniform.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGAUniform.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; 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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGIDefault.java b/src/eva2/server/go/operators/crossover/CrossoverGIDefault.java similarity index 94% rename from src/javaeva/server/go/operators/crossover/CrossoverGIDefault.java rename to src/eva2/server/go/operators/crossover/CrossoverGIDefault.java index d7fd5799..3c926339 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGIDefault.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGIDefault.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGIIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGINPoint.java b/src/eva2/server/go/operators/crossover/CrossoverGINPoint.java similarity index 94% rename from src/javaeva/server/go/operators/crossover/CrossoverGINPoint.java rename to src/eva2/server/go/operators/crossover/CrossoverGINPoint.java index a920a7ec..66203821 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGINPoint.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGINPoint.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGIIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGINPointVL.java b/src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java similarity index 96% rename from src/javaeva/server/go/operators/crossover/CrossoverGINPointVL.java rename to src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java index ccb59f60..736ee8fd 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGINPointVL.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGIIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGIUniform.java b/src/eva2/server/go/operators/crossover/CrossoverGIUniform.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverGIUniform.java rename to src/eva2/server/go/operators/crossover/CrossoverGIUniform.java index 1cbdd77b..58505cae 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGIUniform.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGIUniform.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGIIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGPDefault.java b/src/eva2/server/go/operators/crossover/CrossoverGPDefault.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverGPDefault.java rename to src/eva2/server/go/operators/crossover/CrossoverGPDefault.java index 88cae997..acbb9e8a 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGPDefault.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGPDefault.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGPIndividual; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGPIndividual; +import eva2.server.go.individuals.codings.gp.AbstractGPNode; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverOBGAPMX.java b/src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java similarity index 89% rename from src/javaeva/server/go/operators/crossover/CrossoverOBGAPMX.java rename to src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java index dde2c344..27a006d0 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverOBGAPMX.java +++ b/src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java @@ -1,12 +1,12 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypePermutation; -import javaeva.server.go.individuals.InterfaceOBGAIndividual; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypePermutation; +import eva2.server.go.individuals.InterfaceOBGAIndividual; +import eva2.server.go.operators.crossover.InterfaceCrossover; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** *

Title: The JavaEvA

diff --git a/src/javaeva/server/go/operators/crossover/CrossoverOBGAPMXUniform.java b/src/eva2/server/go/operators/crossover/CrossoverOBGAPMXUniform.java similarity index 90% rename from src/javaeva/server/go/operators/crossover/CrossoverOBGAPMXUniform.java rename to src/eva2/server/go/operators/crossover/CrossoverOBGAPMXUniform.java index 75218a8f..38763ea5 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverOBGAPMXUniform.java +++ b/src/eva2/server/go/operators/crossover/CrossoverOBGAPMXUniform.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceOBGAIndividual; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceOBGAIndividual; +import eva2.server.go.operators.crossover.InterfaceCrossover; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** *

Title: The JavaEvA

diff --git a/src/javaeva/server/go/operators/crossover/InterfaceCrossover.java b/src/eva2/server/go/operators/crossover/InterfaceCrossover.java similarity index 87% rename from src/javaeva/server/go/operators/crossover/InterfaceCrossover.java rename to src/eva2/server/go/operators/crossover/InterfaceCrossover.java index d3cb3303..bf311be5 100644 --- a/src/javaeva/server/go/operators/crossover/InterfaceCrossover.java +++ b/src/eva2/server/go/operators/crossover/InterfaceCrossover.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** diff --git a/src/javaeva/server/go/operators/crossover/NoCrossover.java b/src/eva2/server/go/operators/crossover/NoCrossover.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/NoCrossover.java rename to src/eva2/server/go/operators/crossover/NoCrossover.java index 71812edf..d8143dfb 100644 --- a/src/javaeva/server/go/operators/crossover/NoCrossover.java +++ b/src/eva2/server/go/operators/crossover/NoCrossover.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/PropertyCrossoverMixer.java b/src/eva2/server/go/operators/crossover/PropertyCrossoverMixer.java similarity index 99% rename from src/javaeva/server/go/operators/crossover/PropertyCrossoverMixer.java rename to src/eva2/server/go/operators/crossover/PropertyCrossoverMixer.java index b8d1cc32..ffb981dd 100644 --- a/src/javaeva/server/go/operators/crossover/PropertyCrossoverMixer.java +++ b/src/eva2/server/go/operators/crossover/PropertyCrossoverMixer.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/PropertyCrossoverMixerEditor.java b/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java similarity index 99% rename from src/javaeva/server/go/operators/crossover/PropertyCrossoverMixerEditor.java rename to src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java index 30d97fbb..7a8bc501 100644 --- a/src/javaeva/server/go/operators/crossover/PropertyCrossoverMixerEditor.java +++ b/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java @@ -1,10 +1,12 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.tools.GeneralGEOFaker; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.*; import javax.swing.*; + +import eva2.gui.*; +import eva2.server.go.tools.GeneralGEOFaker; +import eva2.server.go.tools.GeneralGOEProperty; + import java.beans.*; import java.awt.*; import java.awt.event.ActionListener; diff --git a/src/javaeva/server/go/operators/crossover/TestESCrossover.java b/src/eva2/server/go/operators/crossover/TestESCrossover.java similarity index 91% rename from src/javaeva/server/go/operators/crossover/TestESCrossover.java rename to src/eva2/server/go/operators/crossover/TestESCrossover.java index 6e0e894c..c03b2fc0 100644 --- a/src/javaeva/server/go/operators/crossover/TestESCrossover.java +++ b/src/eva2/server/go/operators/crossover/TestESCrossover.java @@ -1,16 +1,18 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.gui.Plot; -import javaeva.gui.JParaPanel; -import javaeva.server.go.SwingWorker; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; 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; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; + import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.event.ActionListener; @@ -85,7 +87,7 @@ public class TestESCrossover implements java.io.Serializable { double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("ES Crossover Testert", "x", "y", tmpD, tmpD); + this.m_Plot = new eva2.gui.Plot("ES Crossover Testert", "x", "y", tmpD, tmpD); // validate and show this.m_Frame.validate(); this.m_Frame.setVisible(true); @@ -148,12 +150,12 @@ public class TestESCrossover implements java.io.Serializable { double[] tmpD = new double[2]; tmpD[0] = 1; tmpD[1] = 1; - ((ESIndividualDoubleData)tmpIndyD).initByValue(tmpD, m_Problem); + ((AbstractEAIndividual)tmpIndyD).initByValue(tmpD, m_Problem); tmpIndyEA = (AbstractEAIndividual)((AbstractEAIndividual)tmpIndyD).clone(); tmpD = new double[2]; tmpD[0] = -1; tmpD[1] = -1; - ((ESIndividualDoubleData)tmpIndyEA).initByValue(tmpD, m_Problem); + ((AbstractEAIndividual)tmpIndyEA).initByValue(tmpD, m_Problem); m_Partners.addIndividual(tmpIndyEA); m_Daddy = (AbstractEAIndividual)((AbstractEAIndividual)tmpIndyD).clone(); @@ -191,18 +193,18 @@ public class TestESCrossover implements java.io.Serializable { double[] tmpD = new double[2]; tmpD[0] = 0.5; tmpD[1] = 1.1; - ((ESIndividualDoubleData)tmpIndyD).initByValue(tmpD, m_Problem); + ((AbstractEAIndividual)tmpIndyD).initByValue(tmpD, m_Problem); tmpIndyEA = (AbstractEAIndividual)((AbstractEAIndividual)tmpIndyD).clone(); tmpD = new double[2]; tmpD[0] = 0.1; tmpD[1] = -0.65; - ((ESIndividualDoubleData)tmpIndyEA).initByValue(tmpD, m_Problem); + ((AbstractEAIndividual)tmpIndyEA).initByValue(tmpD, m_Problem); m_Partners.addIndividual(tmpIndyEA); tmpIndyEA = (AbstractEAIndividual)((AbstractEAIndividual)tmpIndyD).clone(); tmpD = new double[2]; tmpD[0] = -0.85; tmpD[1] = 0.3; - ((ESIndividualDoubleData)tmpIndyEA).initByValue(tmpD, m_Problem); + ((AbstractEAIndividual)tmpIndyEA).initByValue(tmpD, m_Problem); m_Partners.addIndividual(tmpIndyEA); m_Daddy = (AbstractEAIndividual)((AbstractEAIndividual)tmpIndyD).clone(); diff --git a/src/javaeva/server/go/operators/distancemetric/GenotypeMetricBitSet.java b/src/eva2/server/go/operators/distancemetric/GenotypeMetricBitSet.java similarity index 90% rename from src/javaeva/server/go/operators/distancemetric/GenotypeMetricBitSet.java rename to src/eva2/server/go/operators/distancemetric/GenotypeMetricBitSet.java index c4382724..df8ce62f 100644 --- a/src/javaeva/server/go/operators/distancemetric/GenotypeMetricBitSet.java +++ b/src/eva2/server/go/operators/distancemetric/GenotypeMetricBitSet.java @@ -1,11 +1,12 @@ -package javaeva.server.go.operators.distancemetric; +package eva2.server.go.operators.distancemetric; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceGAIndividual; import java.util.BitSet; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.InterfaceGAIndividual; + /** Distance based on a bit-set if any. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/distancemetric/InterfaceDistanceMetric.java b/src/eva2/server/go/operators/distancemetric/InterfaceDistanceMetric.java similarity index 89% rename from src/javaeva/server/go/operators/distancemetric/InterfaceDistanceMetric.java rename to src/eva2/server/go/operators/distancemetric/InterfaceDistanceMetric.java index 0fd98468..9ceb0810 100644 --- a/src/javaeva/server/go/operators/distancemetric/InterfaceDistanceMetric.java +++ b/src/eva2/server/go/operators/distancemetric/InterfaceDistanceMetric.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.distancemetric; +package eva2.server.go.operators.distancemetric; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividual; /** This metric methods is experimental and should be moved to the * optimization problem to allow problem specific distance metrics diff --git a/src/javaeva/server/go/operators/distancemetric/ObjectiveSpaceMetric.java b/src/eva2/server/go/operators/distancemetric/ObjectiveSpaceMetric.java similarity index 91% rename from src/javaeva/server/go/operators/distancemetric/ObjectiveSpaceMetric.java rename to src/eva2/server/go/operators/distancemetric/ObjectiveSpaceMetric.java index f7281a53..13cb935f 100644 --- a/src/javaeva/server/go/operators/distancemetric/ObjectiveSpaceMetric.java +++ b/src/eva2/server/go/operators/distancemetric/ObjectiveSpaceMetric.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.distancemetric; +package eva2.server.go.operators.distancemetric; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; +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/javaeva/server/go/operators/distancemetric/PhenotypeMetric.java b/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java similarity index 94% rename from src/javaeva/server/go/operators/distancemetric/PhenotypeMetric.java rename to src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java index 31d2a493..ab19f713 100644 --- a/src/javaeva/server/go/operators/distancemetric/PhenotypeMetric.java +++ b/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java @@ -1,17 +1,18 @@ -package javaeva.server.go.operators.distancemetric; +package eva2.server.go.operators.distancemetric; -import javaeva.gui.BeanInspector; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeBinary; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceDataTypeInteger; -import javaeva.server.go.individuals.InterfaceDataTypePermutation; -import javaeva.server.go.individuals.InterfaceDataTypeProgram; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; import java.util.BitSet; +import eva2.gui.BeanInspector; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeBinary; +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 some of the most common * data types. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java b/src/eva2/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java similarity index 92% rename from src/javaeva/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java rename to src/eva2/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java index bcff44b6..a3e56884 100644 --- a/src/javaeva/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java +++ b/src/eva2/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.distancemetric; +package eva2.server.go.operators.distancemetric; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.operators.mutation.MutateESGlobal; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.operators.mutation.MutateESGlobal; /** This method includes the sigma as distance element. * This can be used to make the CBN-EA self-adaptive diff --git a/src/javaeva/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java b/src/eva2/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java similarity index 91% rename from src/javaeva/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java rename to src/eva2/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java index 7cf24d4d..0488411a 100644 --- a/src/javaeva/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java +++ b/src/eva2/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.fitnessmodifier; +package eva2.server.go.operators.fitnessmodifier; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.cluster.ClusteringDensityBased; -import javaeva.server.go.operators.cluster.InterfaceClustering; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.cluster.ClusteringDensityBased; +import eva2.server.go.operators.cluster.InterfaceClustering; +import eva2.server.go.populations.Population; /** The fitness modifier are defunct and are to be moved to * the selection operators... diff --git a/src/javaeva/server/go/operators/fitnessmodifier/FitnessModifierNone.java b/src/eva2/server/go/operators/fitnessmodifier/FitnessModifierNone.java similarity index 92% rename from src/javaeva/server/go/operators/fitnessmodifier/FitnessModifierNone.java rename to src/eva2/server/go/operators/fitnessmodifier/FitnessModifierNone.java index 88dc5c82..255c2be5 100644 --- a/src/javaeva/server/go/operators/fitnessmodifier/FitnessModifierNone.java +++ b/src/eva2/server/go/operators/fitnessmodifier/FitnessModifierNone.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.fitnessmodifier; +package eva2.server.go.operators.fitnessmodifier; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** The fitness modifier are defunct and are to be moved to * the selection operators... diff --git a/src/javaeva/server/go/operators/fitnessmodifier/FitnessSharing.java b/src/eva2/server/go/operators/fitnessmodifier/FitnessSharing.java similarity index 92% rename from src/javaeva/server/go/operators/fitnessmodifier/FitnessSharing.java rename to src/eva2/server/go/operators/fitnessmodifier/FitnessSharing.java index 753fe1c7..f69cfc58 100644 --- a/src/javaeva/server/go/operators/fitnessmodifier/FitnessSharing.java +++ b/src/eva2/server/go/operators/fitnessmodifier/FitnessSharing.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.fitnessmodifier; +package eva2.server.go.operators.fitnessmodifier; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.InterfaceDistanceMetric; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.server.go.populations.Population; /** The fitness modifier are defunct and are to be moved to * the selection operators... diff --git a/src/javaeva/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java b/src/eva2/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java similarity index 85% rename from src/javaeva/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java rename to src/eva2/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java index 5fe4345f..c5b3c21b 100644 --- a/src/javaeva/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java +++ b/src/eva2/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.fitnessmodifier; +package eva2.server.go.operators.fitnessmodifier; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** The fitness modifier are defunct and are to be moved to * the selection operators... diff --git a/src/javaeva/server/go/operators/migration/InterfaceMigration.java b/src/eva2/server/go/operators/migration/InterfaceMigration.java similarity index 93% rename from src/javaeva/server/go/operators/migration/InterfaceMigration.java rename to src/eva2/server/go/operators/migration/InterfaceMigration.java index 8c4e732a..df85bae6 100644 --- a/src/javaeva/server/go/operators/migration/InterfaceMigration.java +++ b/src/eva2/server/go/operators/migration/InterfaceMigration.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.InterfaceOptimizer; /** The migration methods give the migration topology * (currently all migration methods are typically fully diff --git a/src/javaeva/server/go/operators/migration/MOBestMigration.java b/src/eva2/server/go/operators/migration/MOBestMigration.java similarity index 92% rename from src/javaeva/server/go/operators/migration/MOBestMigration.java rename to src/eva2/server/go/operators/migration/MOBestMigration.java index 6bfd4e79..d3f32d20 100644 --- a/src/javaeva/server/go/operators/migration/MOBestMigration.java +++ b/src/eva2/server/go/operators/migration/MOBestMigration.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectMOMaxiMin; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; +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; +import eva2.server.go.strategies.InterfaceOptimizer; /** Migration based on a Multi-criteria selection mechanism * migrating the n best individuals between all populations. diff --git a/src/javaeva/server/go/operators/migration/MOClusteringSeparation.java b/src/eva2/server/go/operators/migration/MOClusteringSeparation.java similarity index 92% rename from src/javaeva/server/go/operators/migration/MOClusteringSeparation.java rename to src/eva2/server/go/operators/migration/MOClusteringSeparation.java index 2f531c38..fca414f0 100644 --- a/src/javaeva/server/go/operators/migration/MOClusteringSeparation.java +++ b/src/eva2/server/go/operators/migration/MOClusteringSeparation.java @@ -1,28 +1,29 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.operators.archiving.InterfaceArchiving; -import javaeva.server.go.operators.cluster.ClusteringKMeans; -import javaeva.server.go.operators.constraint.ConstBelongsToDifferentClass; -import javaeva.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanLinear; -import javaeva.server.go.operators.constraint.ConstObjectivesInEqualityLesserThanLinear; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectRandom; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; -import javaeva.gui.Plot; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; import wsi.ra.chart2d.DPoint; import java.io.*; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +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.archiving.InterfaceArchiving; +import eva2.server.go.operators.cluster.ClusteringKMeans; +import eva2.server.go.operators.constraint.ConstBelongsToDifferentClass; +import eva2.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanLinear; +import eva2.server.go.operators.constraint.ConstObjectivesInEqualityLesserThanLinear; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectRandom; +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; + /** This method implements the clustering based subdivision * scheme, this method rearanges the populations and may * impose area constraints on the subpopulations. This method @@ -144,7 +145,7 @@ public class MOClusteringSeparation implements InterfaceMigration, java.io.Seria double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/javaeva/server/go/operators/migration/MOConeSeparation.java b/src/eva2/server/go/operators/migration/MOConeSeparation.java similarity index 95% rename from src/javaeva/server/go/operators/migration/MOConeSeparation.java rename to src/eva2/server/go/operators/migration/MOConeSeparation.java index c3ceb25c..23eb2a0d 100644 --- a/src/javaeva/server/go/operators/migration/MOConeSeparation.java +++ b/src/eva2/server/go/operators/migration/MOConeSeparation.java @@ -1,31 +1,32 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.operators.archiving.InterfaceArchiving; -import javaeva.server.go.operators.cluster.ClusteringKMeans; -import javaeva.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanLinear; -import javaeva.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanSurface; -import javaeva.server.go.operators.constraint.ConstObjectivesInEqualityLesserThanLinear; -import javaeva.server.go.operators.constraint.ConstObjectivesInEqualitySmallerThanSurface; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectMOMaxiMin; -import javaeva.server.go.operators.selection.SelectRandom; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; -import javaeva.gui.Plot; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; import wsi.ra.chart2d.DPoint; import java.io.*; import java.util.ArrayList; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +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.archiving.InterfaceArchiving; +import eva2.server.go.operators.cluster.ClusteringKMeans; +import eva2.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanLinear; +import eva2.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanSurface; +import eva2.server.go.operators.constraint.ConstObjectivesInEqualityLesserThanLinear; +import eva2.server.go.operators.constraint.ConstObjectivesInEqualitySmallerThanSurface; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectMOMaxiMin; +import eva2.server.go.operators.selection.SelectRandom; +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; + /** This method implements the cone separation subdivision * scheme, this method rearanges the populations and may * impose area constraints on the subpopulations. @@ -205,7 +206,7 @@ public class MOConeSeparation implements InterfaceMigration, java.io.Serializabl double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/javaeva/server/go/operators/migration/MOXMeansSeparation.java b/src/eva2/server/go/operators/migration/MOXMeansSeparation.java similarity index 93% rename from src/javaeva/server/go/operators/migration/MOXMeansSeparation.java rename to src/eva2/server/go/operators/migration/MOXMeansSeparation.java index eb5a832e..eafb5344 100644 --- a/src/javaeva/server/go/operators/migration/MOXMeansSeparation.java +++ b/src/eva2/server/go/operators/migration/MOXMeansSeparation.java @@ -1,25 +1,26 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.operators.cluster.ClusteringXMeans; -import javaeva.server.go.operators.constraint.ConstBelongsToDifferentClass; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectRandom; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; -import javaeva.gui.Plot; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; import wsi.ra.chart2d.DPoint; import java.io.*; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +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; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectRandom; +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; + /** This method implements the clustering based subdivision * scheme suited to identify uni- and multi-modal search spaces * under development and currently defunct. @@ -143,7 +144,7 @@ public class MOXMeansSeparation implements InterfaceMigration, java.io.Serializa double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/javaeva/server/go/operators/migration/SOBestMigration.java b/src/eva2/server/go/operators/migration/SOBestMigration.java similarity index 91% rename from src/javaeva/server/go/operators/migration/SOBestMigration.java rename to src/eva2/server/go/operators/migration/SOBestMigration.java index ceaccbf5..8c7bae1d 100644 --- a/src/javaeva/server/go/operators/migration/SOBestMigration.java +++ b/src/eva2/server/go/operators/migration/SOBestMigration.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectBestIndividuals; +import eva2.server.go.populations.Population; +import eva2.server.go.strategies.InterfaceOptimizer; /** Simple single-objective migration scheme. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/migration/SOMONoMigration.java b/src/eva2/server/go/operators/migration/SOMONoMigration.java similarity index 86% rename from src/javaeva/server/go/operators/migration/SOMONoMigration.java rename to src/eva2/server/go/operators/migration/SOMONoMigration.java index 1233f721..08be7425 100644 --- a/src/javaeva/server/go/operators/migration/SOMONoMigration.java +++ b/src/eva2/server/go/operators/migration/SOMONoMigration.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectMOMaxiMin; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; +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. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/InterfaceMOSOConverter.java b/src/eva2/server/go/operators/moso/InterfaceMOSOConverter.java similarity index 92% rename from src/javaeva/server/go/operators/moso/InterfaceMOSOConverter.java rename to src/eva2/server/go/operators/moso/InterfaceMOSOConverter.java index 040b14b6..43e492ca 100644 --- a/src/javaeva/server/go/operators/moso/InterfaceMOSOConverter.java +++ b/src/eva2/server/go/operators/moso/InterfaceMOSOConverter.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** The MOSO converter work on the fitness values only and convert a double[] into * a single double values, thus allowing weight aggregation, goal programming and diff --git a/src/javaeva/server/go/operators/moso/MOSODynamicallyWeightedFitness.java b/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java similarity index 95% rename from src/javaeva/server/go/operators/moso/MOSODynamicallyWeightedFitness.java rename to src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java index 45973ce5..579be6ce 100644 --- a/src/javaeva/server/go/operators/moso/MOSODynamicallyWeightedFitness.java +++ b/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.gui.PropertyDoubleArray; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.gui.PropertyDoubleArray; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOEpsilonConstraint.java b/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java similarity index 94% rename from src/javaeva/server/go/operators/moso/MOSOEpsilonConstraint.java rename to src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java index 6ba17b66..09276d1a 100644 --- a/src/javaeva/server/go/operators/moso/MOSOEpsilonConstraint.java +++ b/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.gui.PropertyEpsilonThreshold; -import javaeva.gui.PropertyEpsilonConstraint; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.gui.PropertyEpsilonConstraint; +import eva2.gui.PropertyEpsilonThreshold; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOEpsilonThreshold.java b/src/eva2/server/go/operators/moso/MOSOEpsilonThreshold.java similarity index 95% rename from src/javaeva/server/go/operators/moso/MOSOEpsilonThreshold.java rename to src/eva2/server/go/operators/moso/MOSOEpsilonThreshold.java index a2fcef7c..41582483 100644 --- a/src/javaeva/server/go/operators/moso/MOSOEpsilonThreshold.java +++ b/src/eva2/server/go/operators/moso/MOSOEpsilonThreshold.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.gui.PropertyDoubleArray; -import javaeva.gui.PropertyEpsilonThreshold; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.gui.PropertyDoubleArray; +import eva2.gui.PropertyEpsilonThreshold; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOGoalProgramming.java b/src/eva2/server/go/operators/moso/MOSOGoalProgramming.java similarity index 95% rename from src/javaeva/server/go/operators/moso/MOSOGoalProgramming.java rename to src/eva2/server/go/operators/moso/MOSOGoalProgramming.java index 91375e64..fd39419c 100644 --- a/src/javaeva/server/go/operators/moso/MOSOGoalProgramming.java +++ b/src/eva2/server/go/operators/moso/MOSOGoalProgramming.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.gui.PropertyDoubleArray; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.gui.PropertyDoubleArray; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOLpMetric.java b/src/eva2/server/go/operators/moso/MOSOLpMetric.java similarity index 96% rename from src/javaeva/server/go/operators/moso/MOSOLpMetric.java rename to src/eva2/server/go/operators/moso/MOSOLpMetric.java index bbaa28eb..3d3b5043 100644 --- a/src/javaeva/server/go/operators/moso/MOSOLpMetric.java +++ b/src/eva2/server/go/operators/moso/MOSOLpMetric.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.gui.PropertyDoubleArray; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.gui.PropertyDoubleArray; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOMOGARankBased.java b/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java similarity index 93% rename from src/javaeva/server/go/operators/moso/MOSOMOGARankBased.java rename to src/eva2/server/go/operators/moso/MOSOMOGARankBased.java index 0eea374a..ac5db9e0 100644 --- a/src/javaeva/server/go/operators/moso/MOSOMOGARankBased.java +++ b/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingNSGAII; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOMaxiMin.java b/src/eva2/server/go/operators/moso/MOSOMaxiMin.java similarity index 94% rename from src/javaeva/server/go/operators/moso/MOSOMaxiMin.java rename to src/eva2/server/go/operators/moso/MOSOMaxiMin.java index ddb47040..7630c8e2 100644 --- a/src/javaeva/server/go/operators/moso/MOSOMaxiMin.java +++ b/src/eva2/server/go/operators/moso/MOSOMaxiMin.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +import eva2.gui.GraphPointSet; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; import wsi.ra.chart2d.DPoint; /** @@ -18,7 +18,7 @@ import wsi.ra.chart2d.DPoint; public class MOSOMaxiMin implements InterfaceMOSOConverter, java.io.Serializable { private int m_OutputDimension = 2; - transient protected javaeva.gui.Plot m_Plot = null; + transient protected eva2.gui.Plot m_Plot = null; public MOSOMaxiMin() { } diff --git a/src/javaeva/server/go/operators/moso/MOSONoConvert.java b/src/eva2/server/go/operators/moso/MOSONoConvert.java similarity index 92% rename from src/javaeva/server/go/operators/moso/MOSONoConvert.java rename to src/eva2/server/go/operators/moso/MOSONoConvert.java index 4bd7507b..1a124f83 100644 --- a/src/javaeva/server/go/operators/moso/MOSONoConvert.java +++ b/src/eva2/server/go/operators/moso/MOSONoConvert.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSORandomChoice.java b/src/eva2/server/go/operators/moso/MOSORandomChoice.java similarity index 93% rename from src/javaeva/server/go/operators/moso/MOSORandomChoice.java rename to src/eva2/server/go/operators/moso/MOSORandomChoice.java index 4879b515..56c46223 100644 --- a/src/javaeva/server/go/operators/moso/MOSORandomChoice.java +++ b/src/eva2/server/go/operators/moso/MOSORandomChoice.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSORandomWeight.java b/src/eva2/server/go/operators/moso/MOSORandomWeight.java similarity index 92% rename from src/javaeva/server/go/operators/moso/MOSORandomWeight.java rename to src/eva2/server/go/operators/moso/MOSORandomWeight.java index 5ae4a4bb..d4614dd0 100644 --- a/src/javaeva/server/go/operators/moso/MOSORandomWeight.java +++ b/src/eva2/server/go/operators/moso/MOSORandomWeight.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.gui.PropertyDoubleArray; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.gui.PropertyDoubleArray; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSORankbased.java b/src/eva2/server/go/operators/moso/MOSORankbased.java similarity index 90% rename from src/javaeva/server/go/operators/moso/MOSORankbased.java rename to src/eva2/server/go/operators/moso/MOSORankbased.java index eb2883ac..8b8963da 100644 --- a/src/javaeva/server/go/operators/moso/MOSORankbased.java +++ b/src/eva2/server/go/operators/moso/MOSORankbased.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingNSGAII; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOUtilityFunction.java b/src/eva2/server/go/operators/moso/MOSOUtilityFunction.java similarity index 96% rename from src/javaeva/server/go/operators/moso/MOSOUtilityFunction.java rename to src/eva2/server/go/operators/moso/MOSOUtilityFunction.java index 53b731c8..fca17366 100644 --- a/src/javaeva/server/go/operators/moso/MOSOUtilityFunction.java +++ b/src/eva2/server/go/operators/moso/MOSOUtilityFunction.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOWeightedFitness.java b/src/eva2/server/go/operators/moso/MOSOWeightedFitness.java similarity index 95% rename from src/javaeva/server/go/operators/moso/MOSOWeightedFitness.java rename to src/eva2/server/go/operators/moso/MOSOWeightedFitness.java index 8475027e..c50cef05 100644 --- a/src/javaeva/server/go/operators/moso/MOSOWeightedFitness.java +++ b/src/eva2/server/go/operators/moso/MOSOWeightedFitness.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.gui.PropertyDoubleArray; +import eva2.gui.PropertyDoubleArray; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOWeightedLPTchebycheff.java b/src/eva2/server/go/operators/moso/MOSOWeightedLPTchebycheff.java similarity index 96% rename from src/javaeva/server/go/operators/moso/MOSOWeightedLPTchebycheff.java rename to src/eva2/server/go/operators/moso/MOSOWeightedLPTchebycheff.java index 70dd70de..c4258020 100644 --- a/src/javaeva/server/go/operators/moso/MOSOWeightedLPTchebycheff.java +++ b/src/eva2/server/go/operators/moso/MOSOWeightedLPTchebycheff.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.gui.PropertyWeightedLPTchebycheff; +import eva2.gui.PropertyWeightedLPTchebycheff; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/InterfaceMutation.java b/src/eva2/server/go/operators/mutation/InterfaceMutation.java similarity index 88% rename from src/javaeva/server/go/operators/mutation/InterfaceMutation.java rename to src/eva2/server/go/operators/mutation/InterfaceMutation.java index a85706bd..420238d2 100644 --- a/src/javaeva/server/go/operators/mutation/InterfaceMutation.java +++ b/src/eva2/server/go/operators/mutation/InterfaceMutation.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** diff --git a/src/javaeva/server/go/operators/mutation/MutateEAMixer.java b/src/eva2/server/go/operators/mutation/MutateEAMixer.java similarity index 95% rename from src/javaeva/server/go/operators/mutation/MutateEAMixer.java rename to src/eva2/server/go/operators/mutation/MutateEAMixer.java index 117c7ecc..25ed7ba0 100644 --- a/src/javaeva/server/go/operators/mutation/MutateEAMixer.java +++ b/src/eva2/server/go/operators/mutation/MutateEAMixer.java @@ -1,12 +1,13 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; import java.util.ArrayList; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.gui.GenericObjectEditor; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. @@ -24,7 +25,7 @@ public class MutateEAMixer implements InterfaceMutation, java.io.Serializable { public MutateEAMixer() { InterfaceMutation[] tmpList; - ArrayList mutators = GenericObjectEditor.getClassesFromProperties("javaeva.server.go.operators.mutation.InterfaceMutation"); + ArrayList mutators = GenericObjectEditor.getClassesFromProperties("eva2.server.go.operators.mutation.InterfaceMutation"); tmpList = new InterfaceMutation[mutators.size()]; for (int i = 0; i < mutators.size(); i++) { if (((String)mutators.get(i)).equals(this.getClass().getName())) continue; diff --git a/src/javaeva/server/go/operators/mutation/MutateESCorrolated.java b/src/eva2/server/go/operators/mutation/MutateESCorrolated.java similarity index 97% rename from src/javaeva/server/go/operators/mutation/MutateESCorrolated.java rename to src/eva2/server/go/operators/mutation/MutateESCorrolated.java index cffcd74a..77b4887d 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESCorrolated.java +++ b/src/eva2/server/go/operators/mutation/MutateESCorrolated.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESCovarianceMartixAdaption.java b/src/eva2/server/go/operators/mutation/MutateESCovarianceMartixAdaption.java similarity index 97% rename from src/javaeva/server/go/operators/mutation/MutateESCovarianceMartixAdaption.java rename to src/eva2/server/go/operators/mutation/MutateESCovarianceMartixAdaption.java index 9dcabb78..9b31b3ee 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESCovarianceMartixAdaption.java +++ b/src/eva2/server/go/operators/mutation/MutateESCovarianceMartixAdaption.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; import wsi.ra.math.Jama.EigenvalueDecomposition; import wsi.ra.math.Jama.Matrix; diff --git a/src/javaeva/server/go/operators/mutation/MutateESDefault.java b/src/eva2/server/go/operators/mutation/MutateESDefault.java similarity index 90% rename from src/javaeva/server/go/operators/mutation/MutateESDefault.java rename to src/eva2/server/go/operators/mutation/MutateESDefault.java index 027cb429..8364c01f 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESDefault.java +++ b/src/eva2/server/go/operators/mutation/MutateESDefault.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** diff --git a/src/javaeva/server/go/operators/mutation/MutateESDerandomized.java b/src/eva2/server/go/operators/mutation/MutateESDerandomized.java similarity index 95% rename from src/javaeva/server/go/operators/mutation/MutateESDerandomized.java rename to src/eva2/server/go/operators/mutation/MutateESDerandomized.java index 7a04dcab..39ba851e 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESDerandomized.java +++ b/src/eva2/server/go/operators/mutation/MutateESDerandomized.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESFixedStepSize.java b/src/eva2/server/go/operators/mutation/MutateESFixedStepSize.java similarity index 92% rename from src/javaeva/server/go/operators/mutation/MutateESFixedStepSize.java rename to src/eva2/server/go/operators/mutation/MutateESFixedStepSize.java index 6f3f910a..a56b2d60 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESFixedStepSize.java +++ b/src/eva2/server/go/operators/mutation/MutateESFixedStepSize.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESGlobal.java b/src/eva2/server/go/operators/mutation/MutateESGlobal.java similarity index 95% rename from src/javaeva/server/go/operators/mutation/MutateESGlobal.java rename to src/eva2/server/go/operators/mutation/MutateESGlobal.java index 83af62e8..a512ff1d 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESGlobal.java +++ b/src/eva2/server/go/operators/mutation/MutateESGlobal.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; import java.util.ArrayList; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.tools.SelectedTag; +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.server.go.tools.RandomNumberGenerator; +import eva2.tools.SelectedTag; + /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESLocal.java b/src/eva2/server/go/operators/mutation/MutateESLocal.java similarity index 95% rename from src/javaeva/server/go/operators/mutation/MutateESLocal.java rename to src/eva2/server/go/operators/mutation/MutateESLocal.java index 5f4d4d00..90c5f238 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESLocal.java +++ b/src/eva2/server/go/operators/mutation/MutateESLocal.java @@ -1,16 +1,17 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.tools.SelectedTag; -import javaeva.tools.Tag; import java.util.ArrayList; +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.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; +import eva2.tools.SelectedTag; +import eva2.tools.Tag; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/mutation/MutateESMainVectorAdaption.java b/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java similarity index 96% rename from src/javaeva/server/go/operators/mutation/MutateESMainVectorAdaption.java rename to src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java index 327e9dca..e3e0c93b 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESMainVectorAdaption.java +++ b/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESMutativeStepSizeControl.java b/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java similarity index 94% rename from src/javaeva/server/go/operators/mutation/MutateESMutativeStepSizeControl.java rename to src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java index c8587ada..103399aa 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESMutativeStepSizeControl.java +++ b/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESStandard.java b/src/eva2/server/go/operators/mutation/MutateESStandard.java similarity index 91% rename from src/javaeva/server/go/operators/mutation/MutateESStandard.java rename to src/eva2/server/go/operators/mutation/MutateESStandard.java index 4b258341..7a16db68 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESStandard.java +++ b/src/eva2/server/go/operators/mutation/MutateESStandard.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESSuccessRule.java b/src/eva2/server/go/operators/mutation/MutateESSuccessRule.java similarity index 94% rename from src/javaeva/server/go/operators/mutation/MutateESSuccessRule.java rename to src/eva2/server/go/operators/mutation/MutateESSuccessRule.java index 3ab68de0..c781f472 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESSuccessRule.java +++ b/src/eva2/server/go/operators/mutation/MutateESSuccessRule.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGAAdaptive.java b/src/eva2/server/go/operators/mutation/MutateGAAdaptive.java similarity index 94% rename from src/javaeva/server/go/operators/mutation/MutateGAAdaptive.java rename to src/eva2/server/go/operators/mutation/MutateGAAdaptive.java index de2b2fcf..8b1e9f9c 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGAAdaptive.java +++ b/src/eva2/server/go/operators/mutation/MutateGAAdaptive.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; 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.server.go.tools.RandomNumberGenerator; + /** * The mutation probability is adapted using a parameter tau and stored in the individual. * Better mutation probabilities are selected indirectly as they produce better offspring. diff --git a/src/javaeva/server/go/operators/mutation/MutateGADefault.java b/src/eva2/server/go/operators/mutation/MutateGADefault.java similarity index 90% rename from src/javaeva/server/go/operators/mutation/MutateGADefault.java rename to src/eva2/server/go/operators/mutation/MutateGADefault.java index da085b44..40d18303 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGADefault.java +++ b/src/eva2/server/go/operators/mutation/MutateGADefault.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** diff --git a/src/javaeva/server/go/operators/mutation/MutateGAInvertBits.java b/src/eva2/server/go/operators/mutation/MutateGAInvertBits.java similarity index 94% rename from src/javaeva/server/go/operators/mutation/MutateGAInvertBits.java rename to src/eva2/server/go/operators/mutation/MutateGAInvertBits.java index 7e8e1cf9..6b1b2522 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGAInvertBits.java +++ b/src/eva2/server/go/operators/mutation/MutateGAInvertBits.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; 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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/mutation/MutateGAStandard.java b/src/eva2/server/go/operators/mutation/MutateGAStandard.java similarity index 92% rename from src/javaeva/server/go/operators/mutation/MutateGAStandard.java rename to src/eva2/server/go/operators/mutation/MutateGAStandard.java index de772d03..73842741 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGAStandard.java +++ b/src/eva2/server/go/operators/mutation/MutateGAStandard.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; 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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/mutation/MutateGASwapBits.java b/src/eva2/server/go/operators/mutation/MutateGASwapBits.java similarity index 92% rename from src/javaeva/server/go/operators/mutation/MutateGASwapBits.java rename to src/eva2/server/go/operators/mutation/MutateGASwapBits.java index 4b257432..14c3fc3f 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGASwapBits.java +++ b/src/eva2/server/go/operators/mutation/MutateGASwapBits.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; 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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/mutation/MutateGIDefault.java b/src/eva2/server/go/operators/mutation/MutateGIDefault.java similarity index 90% rename from src/javaeva/server/go/operators/mutation/MutateGIDefault.java rename to src/eva2/server/go/operators/mutation/MutateGIDefault.java index 195e364f..0a1462b3 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGIDefault.java +++ b/src/eva2/server/go/operators/mutation/MutateGIDefault.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGIIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGIInsertDelete.java b/src/eva2/server/go/operators/mutation/MutateGIInsertDelete.java similarity index 94% rename from src/javaeva/server/go/operators/mutation/MutateGIInsertDelete.java rename to src/eva2/server/go/operators/mutation/MutateGIInsertDelete.java index 4bce1409..05cda601 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGIInsertDelete.java +++ b/src/eva2/server/go/operators/mutation/MutateGIInsertDelete.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGIIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGIInvert.java b/src/eva2/server/go/operators/mutation/MutateGIInvert.java similarity index 92% rename from src/javaeva/server/go/operators/mutation/MutateGIInvert.java rename to src/eva2/server/go/operators/mutation/MutateGIInvert.java index 6ffc0816..4daaa58b 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGIInvert.java +++ b/src/eva2/server/go/operators/mutation/MutateGIInvert.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGIIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGINominal.java b/src/eva2/server/go/operators/mutation/MutateGINominal.java similarity index 92% rename from src/javaeva/server/go/operators/mutation/MutateGINominal.java rename to src/eva2/server/go/operators/mutation/MutateGINominal.java index 7d135382..ee9eb993 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGINominal.java +++ b/src/eva2/server/go/operators/mutation/MutateGINominal.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGIIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGIOrdinal.java b/src/eva2/server/go/operators/mutation/MutateGIOrdinal.java similarity index 93% rename from src/javaeva/server/go/operators/mutation/MutateGIOrdinal.java rename to src/eva2/server/go/operators/mutation/MutateGIOrdinal.java index 95a83b21..e36f119c 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGIOrdinal.java +++ b/src/eva2/server/go/operators/mutation/MutateGIOrdinal.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGIIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGITranslocate.java b/src/eva2/server/go/operators/mutation/MutateGITranslocate.java similarity index 93% rename from src/javaeva/server/go/operators/mutation/MutateGITranslocate.java rename to src/eva2/server/go/operators/mutation/MutateGITranslocate.java index 15b2b84f..a9cd8607 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGITranslocate.java +++ b/src/eva2/server/go/operators/mutation/MutateGITranslocate.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGIIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** diff --git a/src/javaeva/server/go/operators/mutation/MutateGPAdaptive.java b/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java similarity index 93% rename from src/javaeva/server/go/operators/mutation/MutateGPAdaptive.java rename to src/eva2/server/go/operators/mutation/MutateGPAdaptive.java index 7d02b7c9..d8698dad 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGPAdaptive.java +++ b/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.individuals.InterfaceGPIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGAIndividual; +import eva2.server.go.individuals.InterfaceGPIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/mutation/MutateGPDefault.java b/src/eva2/server/go/operators/mutation/MutateGPDefault.java similarity index 91% rename from src/javaeva/server/go/operators/mutation/MutateGPDefault.java rename to src/eva2/server/go/operators/mutation/MutateGPDefault.java index caa4b250..b02267fc 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGPDefault.java +++ b/src/eva2/server/go/operators/mutation/MutateGPDefault.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGPIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGPIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGPSingleNode.java b/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java similarity index 89% rename from src/javaeva/server/go/operators/mutation/MutateGPSingleNode.java rename to src/eva2/server/go/operators/mutation/MutateGPSingleNode.java index 3e46b69f..68254275 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGPSingleNode.java +++ b/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java @@ -1,16 +1,17 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeProgram; -import javaeva.server.go.individuals.InterfaceGPIndividual; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.individuals.codings.gp.GPArea; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; 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; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/mutation/MutateOBGAFlip.java b/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java similarity index 87% rename from src/javaeva/server/go/operators/mutation/MutateOBGAFlip.java rename to src/eva2/server/go/operators/mutation/MutateOBGAFlip.java index 567f12c2..cb5d014c 100644 --- a/src/javaeva/server/go/operators/mutation/MutateOBGAFlip.java +++ b/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypePermutation; -import javaeva.server.go.individuals.InterfaceOBGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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; +import eva2.server.go.tools.RandomNumberGenerator; /** diff --git a/src/javaeva/server/go/operators/mutation/MutateOBGAInversion.java b/src/eva2/server/go/operators/mutation/MutateOBGAInversion.java similarity index 87% rename from src/javaeva/server/go/operators/mutation/MutateOBGAInversion.java rename to src/eva2/server/go/operators/mutation/MutateOBGAInversion.java index 399fd791..0785c2ac 100644 --- a/src/javaeva/server/go/operators/mutation/MutateOBGAInversion.java +++ b/src/eva2/server/go/operators/mutation/MutateOBGAInversion.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypePermutation; -import javaeva.server.go.individuals.InterfaceOBGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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; +import eva2.server.go.tools.RandomNumberGenerator; /** diff --git a/src/javaeva/server/go/operators/mutation/NoMutation.java b/src/eva2/server/go/operators/mutation/NoMutation.java similarity index 91% rename from src/javaeva/server/go/operators/mutation/NoMutation.java rename to src/eva2/server/go/operators/mutation/NoMutation.java index 58b6d43b..ca48721d 100644 --- a/src/javaeva/server/go/operators/mutation/NoMutation.java +++ b/src/eva2/server/go/operators/mutation/NoMutation.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/PropertyMutationMixer.java b/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java similarity index 99% rename from src/javaeva/server/go/operators/mutation/PropertyMutationMixer.java rename to src/eva2/server/go/operators/mutation/PropertyMutationMixer.java index fdade689..a91fb05f 100644 --- a/src/javaeva/server/go/operators/mutation/PropertyMutationMixer.java +++ b/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/PropertyMutationMixerEditor.java b/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java similarity index 99% rename from src/javaeva/server/go/operators/mutation/PropertyMutationMixerEditor.java rename to src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java index bc8b61c5..9aaf3ee5 100644 --- a/src/javaeva/server/go/operators/mutation/PropertyMutationMixerEditor.java +++ b/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java @@ -1,9 +1,11 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.tools.GeneralGEOFaker; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.*; import javax.swing.*; + +import eva2.gui.*; +import eva2.server.go.tools.GeneralGEOFaker; +import eva2.server.go.tools.GeneralGOEProperty; + import java.beans.*; import java.awt.*; import java.awt.event.ActionListener; diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java b/src/eva2/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java similarity index 75% rename from src/javaeva/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java rename to src/eva2/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java index 1b47739c..a48e566d 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; /** Interface for general Pareto front methods. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java similarity index 90% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java index aab11e29..9b5aa0d9 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.gui.PropertyFilePath; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.tools.FileLoader; import java.util.ArrayList; +import eva2.gui.PropertyFilePath; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingAllDominating; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.tools.FileLoader; + /** The D1* Pareto front metric requires a refrence Pareto front * and calculate the distance between the true Pareto front and * the current solution. @@ -18,7 +19,7 @@ import java.util.ArrayList; * Time: 13:57:28 * To change this template use File | Settings | File Templates. */ -public class MetricD1ApproxParetoFront implements javaeva.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { +public class MetricD1ApproxParetoFront implements eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { private String base = System.getProperty("user.dir"); private String FS = System.getProperty("file.separator"); diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java similarity index 90% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java index 2a0ded6a..e8aadb01 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.gui.PropertyFilePath; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.tools.FileLoader; import java.util.ArrayList; +import eva2.gui.PropertyFilePath; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingAllDominating; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.tools.FileLoader; + /** The D1 Pareto front metric requires a refrence Pareto front * and calculate the distance between the current solution and * the true Pareto front. @@ -18,7 +19,7 @@ import java.util.ArrayList; * Time: 13:57:13 * To change this template use File | Settings | File Templates. */ -public class MetricD1TrueParetoFront implements javaeva.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { +public class MetricD1TrueParetoFront implements eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { private String base = System.getProperty("user.dir"); private String FS = System.getProperty("file.separator"); diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricErrorRatio.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java similarity index 92% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricErrorRatio.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java index 23653dc3..4fb26c88 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricErrorRatio.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; import wsi.ra.tool.ResourceLoader; @@ -6,12 +6,13 @@ import java.io.ByteArrayInputStream; import java.util.Properties; import java.util.ArrayList; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.tools.FileLoader; -import javaeva.gui.PropertyFilePath; +import eva2.gui.PropertyFilePath; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingAllDominating; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.tools.FileLoader; + /** The error ratio metric only suited for small discrete * Pareto fronts, since it calculates the intersection between @@ -22,7 +23,7 @@ import javaeva.gui.PropertyFilePath; * Time: 17:22:23 * To change this template use File | Settings | File Templates. */ -public class MetricErrorRatio implements javaeva.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { +public class MetricErrorRatio implements eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { private String base = System.getProperty("user.dir"); private String FS = System.getProperty("file.separator"); diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java similarity index 90% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java index 8ef90d4a..8062ebb2 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.gui.PropertyFilePath; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.tools.FileLoader; import java.util.ArrayList; +import eva2.gui.PropertyFilePath; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingAllDominating; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.tools.FileLoader; + /** Maximum Pareto Front Error gives the maximum distance of all minimum distances of each * element in the current solution to the true Pareto front. * Created by IntelliJ IDEA. @@ -17,7 +18,7 @@ import java.util.ArrayList; * Time: 13:25:44 * To change this template use File | Settings | File Templates. */ -public class MetricMaximumParetoFrontError implements javaeva.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { +public class MetricMaximumParetoFrontError implements eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { private String base = System.getProperty("user.dir"); private String FS = System.getProperty("file.separator"); diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java similarity index 87% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java index cdf0d032..e847d80e 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingAllDominating; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; /** Overall Non-Dom. Vector Generation calculates simply the number of * non-dominated solutions in the current soltuion set. diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricS.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricS.java similarity index 95% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricS.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricS.java index b847b65a..cc7a179e 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricS.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricS.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.operators.archiving.ArchivingAllDominating; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; /** S-Metric calculates the hyper-volume covered between the current solutions and a reference point. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricSWithReference.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricSWithReference.java similarity index 95% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricSWithReference.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricSWithReference.java index a696790f..f48e6613 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricSWithReference.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricSWithReference.java @@ -1,15 +1,16 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.tools.FileLoader; -import javaeva.gui.PropertyFilePath; import java.util.ArrayList; +import eva2.gui.PropertyFilePath; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.operators.archiving.ArchivingAllDominating; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.tools.FileLoader; + /** S-Metric calculates the hyper-volume covered between the current solutions and a reference point. * But here the difference to a given hybervolume is to be minimized. * Created by IntelliJ IDEA. @@ -108,7 +109,7 @@ public class MetricSWithReference implements InterfaceParetoFrontMetric, java.io double smetric = this.calculateSMetric(pop, this.m_ObjectiveSpaceRange, this.m_ObjectiveSpaceRange.length); if (this.m_ReferenceSMetric < 0) { Population tmpPop = new Population(); - ESIndividualDoubleData tmpIndy; + AbstractEAIndividual tmpIndy; tmpPop.setPopulationSize(this.m_Reference.length); tmpPop.clear(); for (int i = 0; i < this.m_Reference.length; i++) { diff --git a/src/javaeva/server/go/operators/postprocess/InterfacePostProcessParams.java b/src/eva2/server/go/operators/postprocess/InterfacePostProcessParams.java similarity index 94% rename from src/javaeva/server/go/operators/postprocess/InterfacePostProcessParams.java rename to src/eva2/server/go/operators/postprocess/InterfacePostProcessParams.java index d5598845..76069582 100644 --- a/src/javaeva/server/go/operators/postprocess/InterfacePostProcessParams.java +++ b/src/eva2/server/go/operators/postprocess/InterfacePostProcessParams.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.postprocess; +package eva2.server.go.operators.postprocess; /** * Parameters for an optional post processing of found solutions. Mainly contains diff --git a/src/javaeva/server/go/operators/postprocess/PostProcess.java b/src/eva2/server/go/operators/postprocess/PostProcess.java similarity index 95% rename from src/javaeva/server/go/operators/postprocess/PostProcess.java rename to src/eva2/server/go/operators/postprocess/PostProcess.java index e6fe5508..c64211eb 100644 --- a/src/javaeva/server/go/operators/postprocess/PostProcess.java +++ b/src/eva2/server/go/operators/postprocess/PostProcess.java @@ -1,27 +1,28 @@ -package javaeva.server.go.operators.postprocess; +package eva2.server.go.operators.postprocess; import java.util.Collection; -import javaeva.OptimizerFactory; -import javaeva.OptimizerRunnable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.cluster.ClusteringDensityBased; -import javaeva.server.go.operators.cluster.InterfaceClustering; -import javaeva.server.go.operators.distancemetric.InterfaceDistanceMetric; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESFixedStepSize; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiModalProblemKnown; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.problems.FM0Problem; -import javaeva.server.go.problems.InterfaceMultimodalProblemKnown; -import javaeva.server.go.strategies.HillClimbing; -import javaeva.server.stat.InterfaceTextListener; -import javaeva.tools.Pair; +import eva2.OptimizerFactory; +import eva2.OptimizerRunnable; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.cluster.ClusteringDensityBased; +import eva2.server.go.operators.cluster.InterfaceClustering; +import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateESFixedStepSize; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiModalProblemKnown; +import eva2.server.go.problems.AbstractOptimizationProblem; +import eva2.server.go.problems.FM0Problem; +import eva2.server.go.problems.InterfaceMultimodalProblemKnown; +import eva2.server.go.strategies.HillClimbing; +import eva2.server.stat.InterfaceTextListener; +import eva2.tools.Pair; + /** * Postprocess a population / list of individuals to find out a set of distinct optima. diff --git a/src/javaeva/server/go/operators/postprocess/PostProcessParams.java b/src/eva2/server/go/operators/postprocess/PostProcessParams.java similarity index 96% rename from src/javaeva/server/go/operators/postprocess/PostProcessParams.java rename to src/eva2/server/go/operators/postprocess/PostProcessParams.java index 8795a069..d2ba5a81 100644 --- a/src/javaeva/server/go/operators/postprocess/PostProcessParams.java +++ b/src/eva2/server/go/operators/postprocess/PostProcessParams.java @@ -1,8 +1,9 @@ -package javaeva.server.go.operators.postprocess; +package eva2.server.go.operators.postprocess; import java.io.Serializable; -import javaeva.gui.GenericObjectEditor; +import eva2.gui.GenericObjectEditor; + public class PostProcessParams implements InterfacePostProcessParams, Serializable { diff --git a/src/javaeva/server/go/operators/selection/InterfaceSelection.java b/src/eva2/server/go/operators/selection/InterfaceSelection.java similarity index 93% rename from src/javaeva/server/go/operators/selection/InterfaceSelection.java rename to src/eva2/server/go/operators/selection/InterfaceSelection.java index 39b27309..6c524160 100644 --- a/src/javaeva/server/go/operators/selection/InterfaceSelection.java +++ b/src/eva2/server/go/operators/selection/InterfaceSelection.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** Selection methods have to implement on the one hand the diff --git a/src/javaeva/server/go/operators/selection/MOMultipleSolutions.java b/src/eva2/server/go/operators/selection/MOMultipleSolutions.java similarity index 96% rename from src/javaeva/server/go/operators/selection/MOMultipleSolutions.java rename to src/eva2/server/go/operators/selection/MOMultipleSolutions.java index 4464b70f..253bdae1 100644 --- a/src/javaeva/server/go/operators/selection/MOMultipleSolutions.java +++ b/src/eva2/server/go/operators/selection/MOMultipleSolutions.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; import java.util.ArrayList; diff --git a/src/javaeva/server/go/operators/selection/MOSolution.java b/src/eva2/server/go/operators/selection/MOSolution.java similarity index 93% rename from src/javaeva/server/go/operators/selection/MOSolution.java rename to src/eva2/server/go/operators/selection/MOSolution.java index 483edf80..87077fbd 100644 --- a/src/javaeva/server/go/operators/selection/MOSolution.java +++ b/src/eva2/server/go/operators/selection/MOSolution.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/SelectAll.java b/src/eva2/server/go/operators/selection/SelectAll.java similarity index 94% rename from src/javaeva/server/go/operators/selection/SelectAll.java rename to src/eva2/server/go/operators/selection/SelectAll.java index 72ddee13..6aedd69c 100644 --- a/src/javaeva/server/go/operators/selection/SelectAll.java +++ b/src/eva2/server/go/operators/selection/SelectAll.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** Simple method to selecet all. * In case of multiple fitness values the selection diff --git a/src/javaeva/server/go/operators/selection/SelectBest.java b/src/eva2/server/go/operators/selection/SelectBest.java similarity index 96% rename from src/javaeva/server/go/operators/selection/SelectBest.java rename to src/eva2/server/go/operators/selection/SelectBest.java index 20a68c2c..b9bc36e1 100644 --- a/src/javaeva/server/go/operators/selection/SelectBest.java +++ b/src/eva2/server/go/operators/selection/SelectBest.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** Select best individual multiple times if necessary. diff --git a/src/javaeva/server/go/operators/selection/SelectBestIndividuals.java b/src/eva2/server/go/operators/selection/SelectBestIndividuals.java similarity index 97% rename from src/javaeva/server/go/operators/selection/SelectBestIndividuals.java rename to src/eva2/server/go/operators/selection/SelectBestIndividuals.java index 6eef2cc5..806d49d5 100644 --- a/src/javaeva/server/go/operators/selection/SelectBestIndividuals.java +++ b/src/eva2/server/go/operators/selection/SelectBestIndividuals.java @@ -1,11 +1,12 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; + /** Select the best individuals. * In case of multiple fitness values the selection * critria is selected randomly for each selection event. diff --git a/src/javaeva/server/go/operators/selection/SelectEPTournaments.java b/src/eva2/server/go/operators/selection/SelectEPTournaments.java similarity index 97% rename from src/javaeva/server/go/operators/selection/SelectEPTournaments.java rename to src/eva2/server/go/operators/selection/SelectEPTournaments.java index 71850524..3a584189 100644 --- a/src/javaeva/server/go/operators/selection/SelectEPTournaments.java +++ b/src/eva2/server/go/operators/selection/SelectEPTournaments.java @@ -1,11 +1,12 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; + /** This method implements the multiple tournament scheme * for EP. * In case of multiple fitness values the selection diff --git a/src/javaeva/server/go/operators/selection/SelectHomologousMate.java b/src/eva2/server/go/operators/selection/SelectHomologousMate.java similarity index 91% rename from src/javaeva/server/go/operators/selection/SelectHomologousMate.java rename to src/eva2/server/go/operators/selection/SelectHomologousMate.java index 1b3239cd..68e11883 100644 --- a/src/javaeva/server/go/operators/selection/SelectHomologousMate.java +++ b/src/eva2/server/go/operators/selection/SelectHomologousMate.java @@ -1,12 +1,13 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.InterfaceDistanceMetric; -import javaeva.server.go.operators.distancemetric.ObjectiveSpaceMetric; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; +import eva2.server.go.operators.distancemetric.ObjectiveSpaceMetric; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; + /** An experimential implementation for mating restriction. * Possibly defunct. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/SelectMOMAIIDominanceCounter.java b/src/eva2/server/go/operators/selection/SelectMOMAIIDominanceCounter.java similarity index 96% rename from src/javaeva/server/go/operators/selection/SelectMOMAIIDominanceCounter.java rename to src/eva2/server/go/operators/selection/SelectMOMAIIDominanceCounter.java index ac613498..11e5a600 100644 --- a/src/javaeva/server/go/operators/selection/SelectMOMAIIDominanceCounter.java +++ b/src/eva2/server/go/operators/selection/SelectMOMAIIDominanceCounter.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.moso.MOSOMaxiMin; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.moso.MOSOMaxiMin; +import eva2.server.go.populations.Population; /** Experimental selection mechanism for MOMA II where * a single individual is a whole set of Pareto optimal diff --git a/src/javaeva/server/go/operators/selection/SelectMOMaxiMin.java b/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java similarity index 94% rename from src/javaeva/server/go/operators/selection/SelectMOMaxiMin.java rename to src/eva2/server/go/operators/selection/SelectMOMaxiMin.java index 8a5be112..e6034f22 100644 --- a/src/javaeva/server/go/operators/selection/SelectMOMaxiMin.java +++ b/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.moso.MOSOMaxiMin; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.moso.MOSOMaxiMin; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** A multi-objective selection criterion based on the maximin * method. diff --git a/src/javaeva/server/go/operators/selection/SelectMONSGAIICrowedTournament.java b/src/eva2/server/go/operators/selection/SelectMONSGAIICrowedTournament.java similarity index 96% rename from src/javaeva/server/go/operators/selection/SelectMONSGAIICrowedTournament.java rename to src/eva2/server/go/operators/selection/SelectMONSGAIICrowedTournament.java index 19c73821..db253a9c 100644 --- a/src/javaeva/server/go/operators/selection/SelectMONSGAIICrowedTournament.java +++ b/src/eva2/server/go/operators/selection/SelectMONSGAIICrowedTournament.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingNSGAII; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** The infamous NSGA-II selection scheme for multi-objective * optimization based on Pareto ranks and hybergrids. diff --git a/src/javaeva/server/go/operators/selection/SelectMONonDominated.java b/src/eva2/server/go/operators/selection/SelectMONonDominated.java similarity index 96% rename from src/javaeva/server/go/operators/selection/SelectMONonDominated.java rename to src/eva2/server/go/operators/selection/SelectMONonDominated.java index f8ba2327..92f813bf 100644 --- a/src/javaeva/server/go/operators/selection/SelectMONonDominated.java +++ b/src/eva2/server/go/operators/selection/SelectMONonDominated.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** This multi-objective selection method preferrs non-dominated * individuals over dominated ones. Actually, this fails in case diff --git a/src/javaeva/server/go/operators/selection/SelectMOPESA.java b/src/eva2/server/go/operators/selection/SelectMOPESA.java similarity index 93% rename from src/javaeva/server/go/operators/selection/SelectMOPESA.java rename to src/eva2/server/go/operators/selection/SelectMOPESA.java index f628674e..99e9f2b2 100644 --- a/src/javaeva/server/go/operators/selection/SelectMOPESA.java +++ b/src/eva2/server/go/operators/selection/SelectMOPESA.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingPESAII; -import javaeva.server.go.operators.moso.MOSOMaxiMin; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingPESAII; +import eva2.server.go.operators.moso.MOSOMaxiMin; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** The multi-objective PESA selection method. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/SelectMOPESAII.java b/src/eva2/server/go/operators/selection/SelectMOPESAII.java similarity index 95% rename from src/javaeva/server/go/operators/selection/SelectMOPESAII.java rename to src/eva2/server/go/operators/selection/SelectMOPESAII.java index 3b00dc30..b9f6f067 100644 --- a/src/javaeva/server/go/operators/selection/SelectMOPESAII.java +++ b/src/eva2/server/go/operators/selection/SelectMOPESAII.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingPESAII; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.Hashtable; import java.util.ArrayList; import java.util.Enumeration; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingPESAII; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; + /** The multi-objective PESA II selection criteria based on a n-dimensional * grid using a squezzing factor. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/SelectMOSPEAII.java b/src/eva2/server/go/operators/selection/SelectMOSPEAII.java similarity index 91% rename from src/javaeva/server/go/operators/selection/SelectMOSPEAII.java rename to src/eva2/server/go/operators/selection/SelectMOSPEAII.java index d290156a..219f4053 100644 --- a/src/javaeva/server/go/operators/selection/SelectMOSPEAII.java +++ b/src/eva2/server/go/operators/selection/SelectMOSPEAII.java @@ -1,14 +1,14 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.operators.archiving.ArchivingSPEAII; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; -import javaeva.gui.Plot; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +import eva2.gui.GraphPointSet; +import eva2.gui.Plot; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingNSGAII; +import eva2.server.go.operators.archiving.ArchivingSPEAII; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; import wsi.ra.chart2d.DPoint; /** The SPEA II selection criteria using strength and raw fitness to determine @@ -80,7 +80,7 @@ public class SelectMOSPEAII implements InterfaceSelection, java.io.Serializable double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - Plot plot = new javaeva.gui.Plot("Debug SPEAIISelect", "Y1", "Y2", tmpD, tmpD); + Plot plot = new eva2.gui.Plot("Debug SPEAIISelect", "Y1", "Y2", tmpD, tmpD); plot.setUnconnectedPoint(0, 0, 11); plot.setUnconnectedPoint(1.2, 10, 11); GraphPointSet mySet = new GraphPointSet(10, plot.getFunctionArea()); diff --git a/src/javaeva/server/go/operators/selection/SelectParticleWheel.java b/src/eva2/server/go/operators/selection/SelectParticleWheel.java similarity index 92% rename from src/javaeva/server/go/operators/selection/SelectParticleWheel.java rename to src/eva2/server/go/operators/selection/SelectParticleWheel.java index ad6ba5c4..2e788891 100644 --- a/src/javaeva/server/go/operators/selection/SelectParticleWheel.java +++ b/src/eva2/server/go/operators/selection/SelectParticleWheel.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.selection.probability.InterfaceSelectionProbability; -import javaeva.server.go.operators.selection.probability.SelProbBoltzman; -import javaeva.server.go.operators.selection.probability.SelProbStandard; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.selection.probability.InterfaceSelectionProbability; +import eva2.server.go.operators.selection.probability.SelProbBoltzman; +import eva2.server.go.operators.selection.probability.SelProbStandard; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** This method implements the roulette wheel selection for diff --git a/src/javaeva/server/go/operators/selection/SelectRandom.java b/src/eva2/server/go/operators/selection/SelectRandom.java similarity index 95% rename from src/javaeva/server/go/operators/selection/SelectRandom.java rename to src/eva2/server/go/operators/selection/SelectRandom.java index f92f699a..8f089653 100644 --- a/src/javaeva/server/go/operators/selection/SelectRandom.java +++ b/src/eva2/server/go/operators/selection/SelectRandom.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** Random selection typically used for ES a mating selection. diff --git a/src/javaeva/server/go/operators/selection/SelectTournament.java b/src/eva2/server/go/operators/selection/SelectTournament.java similarity index 96% rename from src/javaeva/server/go/operators/selection/SelectTournament.java rename to src/eva2/server/go/operators/selection/SelectTournament.java index 47dfa400..1be04074 100644 --- a/src/javaeva/server/go/operators/selection/SelectTournament.java +++ b/src/eva2/server/go/operators/selection/SelectTournament.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** Tournament selection within a given tournament group size, * also scaling invariant. diff --git a/src/javaeva/server/go/operators/selection/SelectXProbRouletteWheel.java b/src/eva2/server/go/operators/selection/SelectXProbRouletteWheel.java similarity index 96% rename from src/javaeva/server/go/operators/selection/SelectXProbRouletteWheel.java rename to src/eva2/server/go/operators/selection/SelectXProbRouletteWheel.java index f48df4bd..0fa4c3bc 100644 --- a/src/javaeva/server/go/operators/selection/SelectXProbRouletteWheel.java +++ b/src/eva2/server/go/operators/selection/SelectXProbRouletteWheel.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.selection.probability.InterfaceSelectionProbability; -import javaeva.server.go.operators.selection.probability.SelProbStandard; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.selection.probability.InterfaceSelectionProbability; +import eva2.server.go.operators.selection.probability.SelProbStandard; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; class treeElement implements java.io.Serializable { diff --git a/src/javaeva/server/go/operators/selection/probability/AbstractSelProb.java b/src/eva2/server/go/operators/selection/probability/AbstractSelProb.java similarity index 97% rename from src/javaeva/server/go/operators/selection/probability/AbstractSelProb.java rename to src/eva2/server/go/operators/selection/probability/AbstractSelProb.java index 714c2ae0..33c1ee3c 100644 --- a/src/javaeva/server/go/operators/selection/probability/AbstractSelProb.java +++ b/src/eva2/server/go/operators/selection/probability/AbstractSelProb.java @@ -1,10 +1,11 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; + /** This abstract implementation gives some general * methods for retrieving and cleaning fitness values. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/probability/InterfaceSelectionProbability.java b/src/eva2/server/go/operators/selection/probability/InterfaceSelectionProbability.java similarity index 94% rename from src/javaeva/server/go/operators/selection/probability/InterfaceSelectionProbability.java rename to src/eva2/server/go/operators/selection/probability/InterfaceSelectionProbability.java index ef7360a6..76121693 100644 --- a/src/javaeva/server/go/operators/selection/probability/InterfaceSelectionProbability.java +++ b/src/eva2/server/go/operators/selection/probability/InterfaceSelectionProbability.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** The interface for methods with calculate the selection * propability from the fitness values. While the fitness diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbBoltzman.java b/src/eva2/server/go/operators/selection/probability/SelProbBoltzman.java similarity index 98% rename from src/javaeva/server/go/operators/selection/probability/SelProbBoltzman.java rename to src/eva2/server/go/operators/selection/probability/SelProbBoltzman.java index 19f44f20..3acd8ca5 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbBoltzman.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbBoltzman.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** Boltzman selection, actually it is no a selection method * but a scaling method, but it is very good, because it is diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbFitnessSharing.java b/src/eva2/server/go/operators/selection/probability/SelProbFitnessSharing.java similarity index 93% rename from src/javaeva/server/go/operators/selection/probability/SelProbFitnessSharing.java rename to src/eva2/server/go/operators/selection/probability/SelProbFitnessSharing.java index 16e180bd..8ada3c0b 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbFitnessSharing.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbFitnessSharing.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.InterfaceDistanceMetric; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.server.go.populations.Population; /** Here we have the infamous fitness sharing method. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbInvertByMax.java b/src/eva2/server/go/operators/selection/probability/SelProbInvertByMax.java similarity index 95% rename from src/javaeva/server/go/operators/selection/probability/SelProbInvertByMax.java rename to src/eva2/server/go/operators/selection/probability/SelProbInvertByMax.java index 18f7f775..ad71bf28 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbInvertByMax.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbInvertByMax.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Scale the fitness of a maximization problem by inverting it by the maximum fitness, diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbLinearRanking.java b/src/eva2/server/go/operators/selection/probability/SelProbLinearRanking.java similarity index 97% rename from src/javaeva/server/go/operators/selection/probability/SelProbLinearRanking.java rename to src/eva2/server/go/operators/selection/probability/SelProbLinearRanking.java index 7bd39a61..d46f64cb 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbLinearRanking.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbLinearRanking.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** A linear ranking method with offsets. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbNonLinearRanking.java b/src/eva2/server/go/operators/selection/probability/SelProbNonLinearRanking.java similarity index 97% rename from src/javaeva/server/go/operators/selection/probability/SelProbNonLinearRanking.java rename to src/eva2/server/go/operators/selection/probability/SelProbNonLinearRanking.java index 9e46854f..f280fdc6 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbNonLinearRanking.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbNonLinearRanking.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** A non-linear ranking, which is difficult to tune to * the given optimization problem i guess. diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbRanking.java b/src/eva2/server/go/operators/selection/probability/SelProbRanking.java similarity index 95% rename from src/javaeva/server/go/operators/selection/probability/SelProbRanking.java rename to src/eva2/server/go/operators/selection/probability/SelProbRanking.java index 469091c5..51b4e62d 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbRanking.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbRanking.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** Ranking for calculating the selection probability. * This truly scaling invariant. diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbStandard.java b/src/eva2/server/go/operators/selection/probability/SelProbStandard.java similarity index 96% rename from src/javaeva/server/go/operators/selection/probability/SelProbStandard.java rename to src/eva2/server/go/operators/selection/probability/SelProbStandard.java index 8a795679..45c07cf5 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbStandard.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbStandard.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** A simple sum to calculate the selection probability. * diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbStandardScaling.java b/src/eva2/server/go/operators/selection/probability/SelProbStandardScaling.java similarity index 97% rename from src/javaeva/server/go/operators/selection/probability/SelProbStandardScaling.java rename to src/eva2/server/go/operators/selection/probability/SelProbStandardScaling.java index 7ddd49b7..dc5a2323 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbStandardScaling.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbStandardScaling.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** A simple sum with a scaling factor. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/replacement/InterfaceReplacement.java b/src/eva2/server/go/operators/selection/replacement/InterfaceReplacement.java similarity index 80% rename from src/javaeva/server/go/operators/selection/replacement/InterfaceReplacement.java rename to src/eva2/server/go/operators/selection/replacement/InterfaceReplacement.java index d133dbc2..613761de 100644 --- a/src/javaeva/server/go/operators/selection/replacement/InterfaceReplacement.java +++ b/src/eva2/server/go/operators/selection/replacement/InterfaceReplacement.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** Replacement schemes for the steady-state GA. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/replacement/PreplacePreselection.java b/src/eva2/server/go/operators/selection/replacement/PreplacePreselection.java similarity index 90% rename from src/javaeva/server/go/operators/selection/replacement/PreplacePreselection.java rename to src/eva2/server/go/operators/selection/replacement/PreplacePreselection.java index 885fe13d..c53f5b1c 100644 --- a/src/javaeva/server/go/operators/selection/replacement/PreplacePreselection.java +++ b/src/eva2/server/go/operators/selection/replacement/PreplacePreselection.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** The preselection replacement scheme replaces the worst parent in case * the offspring is better. diff --git a/src/javaeva/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java b/src/eva2/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java similarity index 89% rename from src/javaeva/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java rename to src/eva2/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java index 8eeb6610..01e1f4f6 100644 --- a/src/javaeva/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.server.go.populations.Population; /** The deterministic crowiding method replaces the most similar parent if better * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/replacement/ReplaceRandom.java b/src/eva2/server/go/operators/selection/replacement/ReplaceRandom.java similarity index 86% rename from src/javaeva/server/go/operators/selection/replacement/ReplaceRandom.java rename to src/eva2/server/go/operators/selection/replacement/ReplaceRandom.java index 4cbae5b1..e6042dfc 100644 --- a/src/javaeva/server/go/operators/selection/replacement/ReplaceRandom.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplaceRandom.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** Random replacement. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/replacement/ReplaceWorst.java b/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java similarity index 87% rename from src/javaeva/server/go/operators/selection/replacement/ReplaceWorst.java rename to src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java index 79d42c76..30a59fae 100644 --- a/src/javaeva/server/go/operators/selection/replacement/ReplaceWorst.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** This method replaces the worst indvidual in the population. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/replacement/ReplaceWorstParent.java b/src/eva2/server/go/operators/selection/replacement/ReplaceWorstParent.java similarity index 91% rename from src/javaeva/server/go/operators/selection/replacement/ReplaceWorstParent.java rename to src/eva2/server/go/operators/selection/replacement/ReplaceWorstParent.java index 9e0ae820..c1722d36 100644 --- a/src/javaeva/server/go/operators/selection/replacement/ReplaceWorstParent.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplaceWorstParent.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** This method replaces the worst parent. Doesn't work, * most likely it has the effect of a negative elitism. diff --git a/src/javaeva/server/go/operators/selection/replacement/ReplacementCrowding.java b/src/eva2/server/go/operators/selection/replacement/ReplacementCrowding.java similarity index 89% rename from src/javaeva/server/go/operators/selection/replacement/ReplacementCrowding.java rename to src/eva2/server/go/operators/selection/replacement/ReplacementCrowding.java index 51d258f1..80fbf7f8 100644 --- a/src/javaeva/server/go/operators/selection/replacement/ReplacementCrowding.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplacementCrowding.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.operators.selection.SelectRandom; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.server.go.operators.selection.SelectRandom; +import eva2.server.go.populations.Population; /** This crowding method replaces the most similar individual from a random group if better. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/terminators/CombinedTerminator.java b/src/eva2/server/go/operators/terminators/CombinedTerminator.java similarity index 94% rename from src/javaeva/server/go/operators/terminators/CombinedTerminator.java rename to src/eva2/server/go/operators/terminators/CombinedTerminator.java index a6d07246..1c70a80d 100644 --- a/src/javaeva/server/go/operators/terminators/CombinedTerminator.java +++ b/src/eva2/server/go/operators/terminators/CombinedTerminator.java @@ -1,10 +1,11 @@ -package javaeva.server.go.operators.terminators; +package eva2.server.go.operators.terminators; import java.io.Serializable; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.PopulationInterface; -import javaeva.tools.SelectedTag; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.PopulationInterface; +import eva2.tools.SelectedTag; + public class CombinedTerminator implements InterfaceTerminator, Serializable { /** diff --git a/src/javaeva/server/go/operators/terminators/EvaluationTerminator.java b/src/eva2/server/go/operators/terminators/EvaluationTerminator.java similarity index 94% rename from src/javaeva/server/go/operators/terminators/EvaluationTerminator.java rename to src/eva2/server/go/operators/terminators/EvaluationTerminator.java index fb164849..909adcec 100644 --- a/src/javaeva/server/go/operators/terminators/EvaluationTerminator.java +++ b/src/eva2/server/go/operators/terminators/EvaluationTerminator.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.terminators; +package eva2.server.go.operators.terminators; /* * Title: JavaEvA * Description: @@ -14,8 +14,9 @@ package javaeva.server.go.operators.terminators; *==========================================================================*/ import java.io.Serializable; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.InterfaceTerminator; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.PopulationInterface; + /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/go/operators/terminators/FitnessConvergenceTerminator.java b/src/eva2/server/go/operators/terminators/FitnessConvergenceTerminator.java similarity index 94% rename from src/javaeva/server/go/operators/terminators/FitnessConvergenceTerminator.java rename to src/eva2/server/go/operators/terminators/FitnessConvergenceTerminator.java index b264c7d8..303ea3a6 100644 --- a/src/javaeva/server/go/operators/terminators/FitnessConvergenceTerminator.java +++ b/src/eva2/server/go/operators/terminators/FitnessConvergenceTerminator.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.terminators; +package eva2.server.go.operators.terminators; /* * Title: JavaEvA @@ -15,13 +15,14 @@ package javaeva.server.go.operators.terminators; *==========================================================================*/ import java.io.Serializable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.tools.SelectedTag; +import eva2.gui.BeanInspector; +import eva2.server.go.IndividualInterface; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.PopulationInterface; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.tools.SelectedTag; + /*==========================================================================* * CLASS DECLARATION diff --git a/src/javaeva/server/go/operators/terminators/FitnessValueTerminator.java b/src/eva2/server/go/operators/terminators/FitnessValueTerminator.java similarity index 91% rename from src/javaeva/server/go/operators/terminators/FitnessValueTerminator.java rename to src/eva2/server/go/operators/terminators/FitnessValueTerminator.java index d8097f2e..8f2158a7 100644 --- a/src/javaeva/server/go/operators/terminators/FitnessValueTerminator.java +++ b/src/eva2/server/go/operators/terminators/FitnessValueTerminator.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.terminators; +package eva2.server.go.operators.terminators; /* * Title: JavaEvA * Description: @@ -14,9 +14,10 @@ package javaeva.server.go.operators.terminators; *==========================================================================*/ import java.io.Serializable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.InterfaceTerminator; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.PopulationInterface; + /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/go/operators/terminators/GenerationTerminator.java b/src/eva2/server/go/operators/terminators/GenerationTerminator.java similarity index 92% rename from src/javaeva/server/go/operators/terminators/GenerationTerminator.java rename to src/eva2/server/go/operators/terminators/GenerationTerminator.java index b83147c5..2148cc0b 100644 --- a/src/javaeva/server/go/operators/terminators/GenerationTerminator.java +++ b/src/eva2/server/go/operators/terminators/GenerationTerminator.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.terminators; +package eva2.server.go.operators.terminators; /* * Title: JavaEvA * Description: @@ -14,9 +14,10 @@ package javaeva.server.go.operators.terminators; *==========================================================================*/ import java.io.Serializable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.InterfaceTerminator; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.PopulationInterface; + /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/go/operators/terminators/PhenotypeConvergenceTerminator.java b/src/eva2/server/go/operators/terminators/PhenotypeConvergenceTerminator.java similarity index 81% rename from src/javaeva/server/go/operators/terminators/PhenotypeConvergenceTerminator.java rename to src/eva2/server/go/operators/terminators/PhenotypeConvergenceTerminator.java index 298f81fe..553ca808 100644 --- a/src/javaeva/server/go/operators/terminators/PhenotypeConvergenceTerminator.java +++ b/src/eva2/server/go/operators/terminators/PhenotypeConvergenceTerminator.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.terminators; +package eva2.server.go.operators.terminators; -import javaeva.gui.BeanInspector; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.gui.BeanInspector; +import eva2.server.go.IndividualInterface; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.PopulationInterface; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; public class PhenotypeConvergenceTerminator extends FitnessConvergenceTerminator implements InterfaceTerminator { AbstractEAIndividual oldIndy = null; diff --git a/src/javaeva/server/go/populations/PBILPopulation.java b/src/eva2/server/go/populations/PBILPopulation.java similarity index 96% rename from src/javaeva/server/go/populations/PBILPopulation.java rename to src/eva2/server/go/populations/PBILPopulation.java index 5920e4d3..d77cc320 100644 --- a/src/javaeva/server/go/populations/PBILPopulation.java +++ b/src/eva2/server/go/populations/PBILPopulation.java @@ -1,11 +1,12 @@ -package javaeva.server.go.populations; +package eva2.server.go.populations; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGAIndividual; +import eva2.server.go.tools.RandomNumberGenerator; + /** This implementation of Population Based Incremental Learning is only * suited for a BitString based genotyp represenation. * Copyright: Copyright (c) 2003 diff --git a/src/javaeva/server/go/populations/Population.java b/src/eva2/server/go/populations/Population.java similarity index 85% rename from src/javaeva/server/go/populations/Population.java rename to src/eva2/server/go/populations/Population.java index 2b7d52db..06220bc0 100644 --- a/src/javaeva/server/go/populations/Population.java +++ b/src/eva2/server/go/populations/Population.java @@ -1,18 +1,19 @@ -package javaeva.server.go.populations; +package eva2.server.go.populations; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.PriorityQueue; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.AbstractEAIndividualComparator; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.IndividualInterface; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.PopulationInterface; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividualComparator; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.server.go.tools.RandomNumberGenerator; + /** This is a basic implementation for a EA Population. * Copyright: Copyright (c) 2003 @@ -57,8 +58,12 @@ public class Population extends ArrayList implements PopulationInterface, Clonea if (population.get(i) != null) this.add((((AbstractEAIndividual)population.get(i))).clone()); } - if (population.m_Archive != null) this.m_Archive = (Population)population.m_Archive.clone(); - if (population.m_History != null) this.m_History = (ArrayList)population.m_History.clone(); + copyHistAndArchive(population); + } + + public void copyHistAndArchive(Population population) { + if (population.m_Archive != null) this.m_Archive = (Population)population.m_Archive.clone(); + if (population.m_History != null) this.m_History = (ArrayList)population.m_History.clone(); } /** @@ -77,6 +82,21 @@ public class Population extends ArrayList implements PopulationInterface, Clonea public Object clone() { return (Object) new Population(this); } + + /** + * Clone the population without cloning every individual. This produces an empty population + * which can be used to fill with the next generation by an EA and is implemented for efficiency. + * + * @return an empty population with equal members but not containing any individuals + */ + public Population cloneWithoutInds() { + // these two basically clone without cloning every individual + Population res = new Population(); + res.setSameParams(this); + res.copyHistAndArchive(this); + return res; + } + /** This method inits the state of the population AFTER the individuals * have been inited by a problem @@ -265,30 +285,46 @@ public class Population extends ArrayList implements PopulationInterface, Clonea return domSet; } - /** This method will return the index of the current best individual from the - * population. + /** + * This method will return the index of the current best individual from the + * population, yet only the first single criterion is regarded. * @return The index of the best individual. */ public int getIndexOfBestIndividual() { int result = -1; double curBestFitness = Double.POSITIVE_INFINITY; + boolean allViolate = true; for (int i = 0; i < super.size(); i++) { - if ((!((AbstractEAIndividual)super.get(i)).violatesConstraint()) && (((AbstractEAIndividual)super.get(i)).getFitness(0) < curBestFitness)) { - result = i; - curBestFitness = ((AbstractEAIndividual)super.get(i)).getFitness(0); + if (!((AbstractEAIndividual)super.get(i)).violatesConstraint()) { + allViolate = false; + if (getEAIndividual(i).getFitness(0) < curBestFitness) { + result = i; + curBestFitness = getEAIndividual(i).getFitness(0); + } } } - if (result == -1) { - // darn all seem to violate the constraint - // so lets search for the guy who is close to feasible - for (int i = 0; i < super.size(); i++) { - if ((((AbstractEAIndividual)super.get(i)).getConstraintViolation() < curBestFitness)) { - result = i; - curBestFitness = ((AbstractEAIndividual)super.get(i)).getConstraintViolation(); - } - } - System.out.println("Population reports: All individuals violate the constraints, choosing smallest constraint violation."); + if (result < 0) { + if (allViolate) { + // to avoid problems with NaN or infinite fitness value, preselect a random ind. + // TODO: use multi-objective comparison? + result = 0; + curBestFitness = getEAIndividual(0).getConstraintViolation(); + // darn all seem to violate the constraint + // so lets search for the guy who is close to feasible + for (int i = 1; i < super.size(); i++) { + if (getEAIndividual(i).getConstraintViolation() < curBestFitness) { + result = i; + curBestFitness = ((AbstractEAIndividual)super.get(i)).getConstraintViolation(); + } + } + System.err.println("Population reports: All individuals violate the constraints, choosing smallest constraint violation."); + } else { + // not all violate, maybe all are NaN! + // so just select a random one + System.err.println("Population reports: All individuals seem to have NaN or infinite fitness!"); + result = RandomNumberGenerator.randomInt(size()); + } } return result; } @@ -526,6 +562,32 @@ public class Population extends ArrayList implements PopulationInterface, Clonea return strB.toString(); } + public Long[] getIDList() { + Long[] idList = new Long[size()]; + for (int i=0; i 0 ) try { Thread.sleep(sleepTime); } catch(Exception e) {} - if (this.m_Show) this.updateProblemFrame(population); +// /** This method evaluates a given population and set the fitness values +// * accordingly +// * @param population The population that is to be evaluated. +// */ +// public void evaluate(Population population) { +// evaluatePopulationStart(population); +// AbstractEAIndividual tmpIndy; +// +// for (int i = 0; i < population.size(); i++) { +// tmpIndy = (AbstractEAIndividual) population.get(i); +// tmpIndy.resetConstraintViolation(); +// this.evaluate(tmpIndy); +// population.incrFunctionCalls(); +// } +// evaluatePopulationEnd(population); +// //if (sleepTime > 0 ) try { Thread.sleep(sleepTime); } catch(Exception e) {} +//// if (this.m_Show) this.updateProblemFrame(population); +// } + + public void evaluatePopulationEnd(Population pop) { + if (this.m_Show) this.updateProblemFrame(pop); } /** This method evaluate a single individual and sets the fitness values diff --git a/src/javaeva/server/go/problems/FM0Problem.java b/src/eva2/server/go/problems/FM0Problem.java similarity index 93% rename from src/javaeva/server/go/problems/FM0Problem.java rename to src/eva2/server/go/problems/FM0Problem.java index b39b7ed8..688a58c4 100644 --- a/src/javaeva/server/go/problems/FM0Problem.java +++ b/src/eva2/server/go/problems/FM0Problem.java @@ -1,9 +1,11 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; import java.io.Serializable; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.strategies.InterfaceOptimizer; + +import eva2.server.go.problems.Interface2DBorderProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/Interface2DBorderProblem.java b/src/eva2/server/go/problems/Interface2DBorderProblem.java similarity index 94% rename from src/javaeva/server/go/problems/Interface2DBorderProblem.java rename to src/eva2/server/go/problems/Interface2DBorderProblem.java index f6e48354..db275eda 100644 --- a/src/javaeva/server/go/problems/Interface2DBorderProblem.java +++ b/src/eva2/server/go/problems/Interface2DBorderProblem.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** * An interface refactored from InterfaceMultiModalProblem, having only methods used for diff --git a/src/javaeva/server/go/problems/InterfaceAdditionalPopulationInformer.java b/src/eva2/server/go/problems/InterfaceAdditionalPopulationInformer.java similarity index 86% rename from src/javaeva/server/go/problems/InterfaceAdditionalPopulationInformer.java rename to src/eva2/server/go/problems/InterfaceAdditionalPopulationInformer.java index f4fc6704..be896024 100644 --- a/src/javaeva/server/go/problems/InterfaceAdditionalPopulationInformer.java +++ b/src/eva2/server/go/problems/InterfaceAdditionalPopulationInformer.java @@ -1,6 +1,6 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.PopulationInterface; +import eva2.server.go.PopulationInterface; public interface InterfaceAdditionalPopulationInformer { /** This method returns the header for the additional data that is to be written into a file diff --git a/src/javaeva/server/go/problems/InterfaceFirstOrderDerivableProblem.java b/src/eva2/server/go/problems/InterfaceFirstOrderDerivableProblem.java similarity index 90% rename from src/javaeva/server/go/problems/InterfaceFirstOrderDerivableProblem.java rename to src/eva2/server/go/problems/InterfaceFirstOrderDerivableProblem.java index ca455e77..90ff0e3e 100644 --- a/src/javaeva/server/go/problems/InterfaceFirstOrderDerivableProblem.java +++ b/src/eva2/server/go/problems/InterfaceFirstOrderDerivableProblem.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** *

Title: The JavaEvA

diff --git a/src/javaeva/server/go/problems/InterfaceHasInitRange.java b/src/eva2/server/go/problems/InterfaceHasInitRange.java similarity index 87% rename from src/javaeva/server/go/problems/InterfaceHasInitRange.java rename to src/eva2/server/go/problems/InterfaceHasInitRange.java index 1c1b08b3..db7e5bcb 100644 --- a/src/javaeva/server/go/problems/InterfaceHasInitRange.java +++ b/src/eva2/server/go/problems/InterfaceHasInitRange.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** * An interface for optimization problems having an extra initial range diff --git a/src/javaeva/server/go/problems/InterfaceLocalSearchable.java b/src/eva2/server/go/problems/InterfaceLocalSearchable.java similarity index 70% rename from src/javaeva/server/go/problems/InterfaceLocalSearchable.java rename to src/eva2/server/go/problems/InterfaceLocalSearchable.java index ee706204..980471b6 100644 --- a/src/javaeva/server/go/problems/InterfaceLocalSearchable.java +++ b/src/eva2/server/go/problems/InterfaceLocalSearchable.java @@ -1,7 +1,7 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** *

Title: The JavaEvA

diff --git a/src/javaeva/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java b/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java similarity index 83% rename from src/javaeva/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java rename to src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java index 9e21a811..6159c839 100644 --- a/src/javaeva/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java +++ b/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java @@ -1,10 +1,12 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.mocco.paretofrontviewer.InterfaceParetoFrontView; -import javaeva.server.go.mocco.paretofrontviewer.MOCCOViewer; +import eva2.server.go.problems.InterfaceOptimizationObjective; import javax.swing.*; +import eva2.server.go.mocco.paretofrontviewer.InterfaceParetoFrontView; +import eva2.server.go.mocco.paretofrontviewer.MOCCOViewer; + /** This is a general interface to access a multi-objective optimization * problem which enables de novo programming and thus MOCCO * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/InterfaceMultimodalProblem.java b/src/eva2/server/go/problems/InterfaceMultimodalProblem.java similarity index 82% rename from src/javaeva/server/go/problems/InterfaceMultimodalProblem.java rename to src/eva2/server/go/problems/InterfaceMultimodalProblem.java index 06444cf3..e286ae8f 100644 --- a/src/javaeva/server/go/problems/InterfaceMultimodalProblem.java +++ b/src/eva2/server/go/problems/InterfaceMultimodalProblem.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** * An interface to tag possibly multimodal problems, but without diff --git a/src/javaeva/server/go/problems/InterfaceMultimodalProblemKnown.java b/src/eva2/server/go/problems/InterfaceMultimodalProblemKnown.java similarity index 94% rename from src/javaeva/server/go/problems/InterfaceMultimodalProblemKnown.java rename to src/eva2/server/go/problems/InterfaceMultimodalProblemKnown.java index 2b6f5f64..b6e75013 100644 --- a/src/javaeva/server/go/problems/InterfaceMultimodalProblemKnown.java +++ b/src/eva2/server/go/problems/InterfaceMultimodalProblemKnown.java @@ -1,6 +1,6 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** * A multimodal problem which has knowledge of its optima. diff --git a/src/javaeva/server/go/problems/InterfaceOptimizationObjective.java b/src/eva2/server/go/problems/InterfaceOptimizationObjective.java similarity index 97% rename from src/javaeva/server/go/problems/InterfaceOptimizationObjective.java rename to src/eva2/server/go/problems/InterfaceOptimizationObjective.java index 01bfe79b..f3a48fab 100644 --- a/src/javaeva/server/go/problems/InterfaceOptimizationObjective.java +++ b/src/eva2/server/go/problems/InterfaceOptimizationObjective.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/InterfaceOptimizationProblem.java b/src/eva2/server/go/problems/InterfaceOptimizationProblem.java similarity index 92% rename from src/javaeva/server/go/problems/InterfaceOptimizationProblem.java rename to src/eva2/server/go/problems/InterfaceOptimizationProblem.java index 6632331f..2f275b0c 100644 --- a/src/javaeva/server/go/problems/InterfaceOptimizationProblem.java +++ b/src/eva2/server/go/problems/InterfaceOptimizationProblem.java @@ -1,13 +1,14 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.stat.InterfaceStatistics; import javax.swing.*; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.stat.InterfaceStatistics; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/problems/InterfaceOptimizationTarget.java b/src/eva2/server/go/problems/InterfaceOptimizationTarget.java similarity index 91% rename from src/javaeva/server/go/problems/InterfaceOptimizationTarget.java rename to src/eva2/server/go/problems/InterfaceOptimizationTarget.java index da1c7951..88e224e1 100644 --- a/src/javaeva/server/go/problems/InterfaceOptimizationTarget.java +++ b/src/eva2/server/go/problems/InterfaceOptimizationTarget.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/InterfaceProgramProblem.java b/src/eva2/server/go/problems/InterfaceProgramProblem.java similarity index 95% rename from src/javaeva/server/go/problems/InterfaceProgramProblem.java rename to src/eva2/server/go/problems/InterfaceProgramProblem.java index 55c77184..ee7f3ede 100644 --- a/src/javaeva/server/go/problems/InterfaceProgramProblem.java +++ b/src/eva2/server/go/problems/InterfaceProgramProblem.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/MatlabEvalMediator.java b/src/eva2/server/go/problems/MatlabEvalMediator.java similarity index 98% rename from src/javaeva/server/go/problems/MatlabEvalMediator.java rename to src/eva2/server/go/problems/MatlabEvalMediator.java index ce67d2d3..0918059d 100644 --- a/src/javaeva/server/go/problems/MatlabEvalMediator.java +++ b/src/eva2/server/go/problems/MatlabEvalMediator.java @@ -1,6 +1,6 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.gui.BeanInspector; +import eva2.gui.BeanInspector; /** * This implements a thread acting as a mediator between JavaEvA and Matlab. Thanks to the idea diff --git a/src/javaeva/server/go/problems/MatlabProblem.java b/src/eva2/server/go/problems/MatlabProblem.java similarity index 94% rename from src/javaeva/server/go/problems/MatlabProblem.java rename to src/eva2/server/go/problems/MatlabProblem.java index a176a502..418efbb1 100644 --- a/src/javaeva/server/go/problems/MatlabProblem.java +++ b/src/eva2/server/go/problems/MatlabProblem.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -7,19 +7,20 @@ import java.io.PrintWriter; import java.io.Serializable; import java.io.StringWriter; -import javaeva.OptimizerFactory; -import javaeva.OptimizerRunnable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.operators.postprocess.InterfacePostProcessParams; -import javaeva.server.go.operators.postprocess.PostProcess; -import javaeva.server.go.operators.postprocess.PostProcessParams; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.stat.InterfaceTextListener; +import eva2.OptimizerFactory; +import eva2.OptimizerRunnable; +import eva2.gui.BeanInspector; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.server.go.operators.postprocess.InterfacePostProcessParams; +import eva2.server.go.operators.postprocess.PostProcess; +import eva2.server.go.operators.postprocess.PostProcessParams; +import eva2.server.go.populations.Population; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.stat.InterfaceTextListener; + public class MatlabProblem extends AbstractProblemDouble implements InterfaceTextListener, Serializable { private static final long serialVersionUID = 4913310869887420815L; diff --git a/src/javaeva/server/go/problems/PSymbolicRegression.java b/src/eva2/server/go/problems/PSymbolicRegression.java similarity index 83% rename from src/javaeva/server/go/problems/PSymbolicRegression.java rename to src/eva2/server/go/problems/PSymbolicRegression.java index 2f2a0cb3..a62731de 100644 --- a/src/javaeva/server/go/problems/PSymbolicRegression.java +++ b/src/eva2/server/go/problems/PSymbolicRegression.java @@ -1,33 +1,30 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAPIndividualProgramData; -import javaeva.server.go.individuals.GPIndividualProgramData; -import javaeva.server.go.individuals.InterfaceDataTypeProgram; -import javaeva.server.go.individuals.codings.gp.GPArea; -import javaeva.server.go.individuals.codings.gp.GPNodeAdd; -import javaeva.server.go.individuals.codings.gp.GPNodeCos; -import javaeva.server.go.individuals.codings.gp.GPNodeDiv; -import javaeva.server.go.individuals.codings.gp.GPNodeExp; -import javaeva.server.go.individuals.codings.gp.GPNodeInput; -import javaeva.server.go.individuals.codings.gp.GPNodeMult; -import javaeva.server.go.individuals.codings.gp.GPNodePow2; -import javaeva.server.go.individuals.codings.gp.GPNodePow3; -import javaeva.server.go.individuals.codings.gp.GPNodeSin; -import javaeva.server.go.individuals.codings.gp.GPNodeSqrt; -import javaeva.server.go.individuals.codings.gp.GPNodeSub; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.regression.InterfaceRegressionFunction; -import javaeva.server.go.problems.regression.RFKoza_GPI_10_2; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.tools.RandomNumberGenerator; - -import javaeva.server.stat.InterfaceStatistics; -import javaeva.gui.Plot; -import javaeva.gui.JEFrame; - -import javax.swing.*; +import eva2.gui.Plot; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.GAPIndividualProgramData; +import eva2.server.go.individuals.GPIndividualProgramData; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.InterfaceDataTypeProgram; +import eva2.server.go.individuals.codings.gp.GPArea; +import eva2.server.go.individuals.codings.gp.GPNodeAdd; +import eva2.server.go.individuals.codings.gp.GPNodeCos; +import eva2.server.go.individuals.codings.gp.GPNodeDiv; +import eva2.server.go.individuals.codings.gp.GPNodeExp; +import eva2.server.go.individuals.codings.gp.GPNodeInput; +import eva2.server.go.individuals.codings.gp.GPNodeMult; +import eva2.server.go.individuals.codings.gp.GPNodePow2; +import eva2.server.go.individuals.codings.gp.GPNodePow3; +import eva2.server.go.individuals.codings.gp.GPNodeSin; +import eva2.server.go.individuals.codings.gp.GPNodeSqrt; +import eva2.server.go.individuals.codings.gp.GPNodeSub; +import eva2.server.go.individuals.codings.gp.InterfaceProgram; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.regression.InterfaceRegressionFunction; +import eva2.server.go.problems.regression.RFKoza_GPI_10_2; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.tools.RandomNumberGenerator; +import eva2.tools.EVAERROR; /** * Created by IntelliJ IDEA. @@ -57,7 +54,6 @@ public class PSymbolicRegression extends AbstractOptimizationProblem implements public PSymbolicRegression() { this.m_Template = new GPIndividualProgramData(); - this.compileArea(); this.initProblem(); } @@ -100,6 +96,8 @@ public class PSymbolicRegression extends AbstractOptimizationProblem implements /** This method inits the Problem to log multiruns */ public void initProblem() { + this.compileArea(); + if (m_TargetFunction == null) m_TargetFunction = new RFKoza_GPI_10_2(); this.m_OverallBest = null; this.m_C = new double[this.m_NumberOfConstants]; for (int i = 0; i < this.m_C.length; i++) this.m_C[i] = RandomNumberGenerator.randomDouble(-10, 10); @@ -130,7 +128,7 @@ public class PSymbolicRegression extends AbstractOptimizationProblem implements */ public void initPopulation(Population population) { AbstractEAIndividual tmpIndy; -; + population.clear(); GPArea tmpArea[] = new GPArea[1]; @@ -162,31 +160,34 @@ public class PSymbolicRegression extends AbstractOptimizationProblem implements public void evaluate(Population population) { AbstractEAIndividual tmpIndy; + evaluatePopulationStart(population); for (int i = 0; i < population.size(); i++) { tmpIndy = (AbstractEAIndividual) population.get(i); tmpIndy.resetConstraintViolation(); - if ((tmpIndy instanceof GAPIndividualProgramData) && (this.m_UseLocalHillClimbing)) { -// AbstractEAIndividual tmpBestConst = (AbstractEAIndividual)((GAPIndividualProgramData)tmpIndy).getNumbers(); -// AbstractEAIndividual tmpConst; -// this.evaluate(tmpIndy); -// tmpBestConst.SetFitness(0, tmpIndy.getFitness(0)); -// population.incrFunctionCalls(); -// for (int j = 0; j < 10; j++) { -// tmpConst = (AbstractEAIndividual)tmpBestConst.clone(); -// tmpConst.mutate(); -// ((GAPIndividualProgramData)tmpIndy).setNumbers((InterfaceDataTypeDouble)tmpConst); -// this.evaluate(tmpIndy); -// tmpConst.SetFitness(0, tmpIndy.getFitness(0)); -// population.incrFunctionCalls(); -// if (tmpBestConst.getFitness(0) > tmpConst.getFitness(0)) tmpBestConst = (AbstractEAIndividual)tmpConst.clone(); -// } -// ((GAPIndividualProgramData)tmpIndy).setNumbers((InterfaceDataTypeDouble)tmpBestConst); -// tmpIndy.SetFitness(0, tmpBestConst.getFitness(0)); + if ((this.m_UseLocalHillClimbing) && (tmpIndy instanceof GAPIndividualProgramData)) { + AbstractEAIndividual tmpBestConst = (AbstractEAIndividual)((GAPIndividualProgramData)tmpIndy).getNumbers(); + AbstractEAIndividual tmpConst; + this.evaluate(tmpIndy); + tmpBestConst.SetFitness(0, tmpIndy.getFitness(0)); + population.incrFunctionCalls(); + for (int j = 0; j < 10; j++) { + tmpConst = (AbstractEAIndividual)tmpBestConst.clone(); + tmpConst.mutate(); + ((GAPIndividualProgramData)tmpIndy).setNumbers((InterfaceDataTypeDouble)tmpConst); + this.evaluate(tmpIndy); + tmpConst.SetFitness(0, tmpIndy.getFitness(0)); + population.incrFunctionCalls(); + if (tmpBestConst.getFitness(0) > tmpConst.getFitness(0)) tmpBestConst = (AbstractEAIndividual)tmpConst.clone(); + } + ((GAPIndividualProgramData)tmpIndy).setNumbers((InterfaceDataTypeDouble)tmpBestConst); + tmpIndy.SetFitness(0, tmpBestConst.getFitness(0)); } else { + if (m_UseLocalHillClimbing) EVAERROR.errorMsgOnce("Error: local hill climbing only works on GAPIndividualProgramData individuals!"); this.evaluate(tmpIndy); population.incrFunctionCalls(); } } + evaluatePopulationEnd(population); } /** This method evaluate a single individual and sets the fitness values @@ -322,8 +323,8 @@ public class PSymbolicRegression extends AbstractOptimizationProblem implements return "Toggel the use of local hill climbing for inner constants."; } - /** This method allows you to set the number of ephremial constanst. - * @param b The new number of epremial constants. + /** This method allows you to set the number of ephremial constants. + * @param b The new number of ephremial constants. */ public void setNumberOfConstants(int b) { this.m_NumberOfConstants = b; diff --git a/src/javaeva/server/go/problems/SimpleProblemWrapper.java b/src/eva2/server/go/problems/SimpleProblemWrapper.java similarity index 91% rename from src/javaeva/server/go/problems/SimpleProblemWrapper.java rename to src/eva2/server/go/problems/SimpleProblemWrapper.java index 8db417c3..5a333e49 100644 --- a/src/javaeva/server/go/problems/SimpleProblemWrapper.java +++ b/src/eva2/server/go/problems/SimpleProblemWrapper.java @@ -1,18 +1,19 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; import java.lang.reflect.Method; import java.util.BitSet; -import javaeva.gui.BeanInspector; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.individuals.InterfaceDataTypeBinary; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.gui.BeanInspector; +import eva2.gui.GenericObjectEditor; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.individuals.InterfaceDataTypeBinary; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.populations.Population; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.tools.RandomNumberGenerator; + import simpleprobs.InterfaceSimpleProblem; import simpleprobs.SimpleF1; import simpleprobs.SimpleProblemBinary; diff --git a/src/javaeva/server/go/problems/TF1Problem.java b/src/eva2/server/go/problems/TF1Problem.java similarity index 95% rename from src/javaeva/server/go/problems/TF1Problem.java rename to src/eva2/server/go/problems/TF1Problem.java index c57e9af8..55c1b4b1 100644 --- a/src/javaeva/server/go/problems/TF1Problem.java +++ b/src/eva2/server/go/problems/TF1Problem.java @@ -1,24 +1,25 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.operators.constraint.InterfaceConstraint; -import javaeva.server.go.operators.moso.InterfaceMOSOConverter; -import javaeva.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; -import javaeva.gui.PropertyFilePath; import wsi.ra.chart2d.DPoint; import java.util.ArrayList; import java.awt.Color; import java.io.BufferedWriter; import java.io.FileWriter; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +import eva2.gui.GraphPointSet; +import eva2.gui.PropertyFilePath; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.operators.constraint.InterfaceConstraint; +import eva2.server.go.operators.moso.InterfaceMOSOConverter; +import eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric; +import eva2.server.go.populations.Population; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche @@ -197,7 +198,7 @@ public class TF1Problem extends AbstractMultiObjectiveOptimizationProblem implem * @param plot The plot where you can draw your stuff. * @param index The first index where you can draw your stuff */ - public void drawAdditionalData(javaeva.gui.Plot plot, Population pop, int index) { + public void drawAdditionalData(eva2.gui.Plot plot, Population pop, int index) { double[] tmpFitness; // for example plot the current population //plot.clearGraph(index); diff --git a/src/javaeva/server/go/problems/regression/InterfaceRegressionFunction.java b/src/eva2/server/go/problems/regression/InterfaceRegressionFunction.java similarity index 91% rename from src/javaeva/server/go/problems/regression/InterfaceRegressionFunction.java rename to src/eva2/server/go/problems/regression/InterfaceRegressionFunction.java index 466305d9..c774798e 100644 --- a/src/javaeva/server/go/problems/regression/InterfaceRegressionFunction.java +++ b/src/eva2/server/go/problems/regression/InterfaceRegressionFunction.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFKoza_GPI_10_1.java b/src/eva2/server/go/problems/regression/RFKoza_GPI_10_1.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFKoza_GPI_10_1.java rename to src/eva2/server/go/problems/regression/RFKoza_GPI_10_1.java index 0575ba41..e74021ca 100644 --- a/src/javaeva/server/go/problems/regression/RFKoza_GPI_10_1.java +++ b/src/eva2/server/go/problems/regression/RFKoza_GPI_10_1.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFKoza_GPI_10_2.java b/src/eva2/server/go/problems/regression/RFKoza_GPI_10_2.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFKoza_GPI_10_2.java rename to src/eva2/server/go/problems/regression/RFKoza_GPI_10_2.java index 1ef28c7a..ff92b885 100644 --- a/src/javaeva/server/go/problems/regression/RFKoza_GPI_10_2.java +++ b/src/eva2/server/go/problems/regression/RFKoza_GPI_10_2.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFKoza_GPI_7_3.java b/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFKoza_GPI_7_3.java rename to src/eva2/server/go/problems/regression/RFKoza_GPI_7_3.java index 77ac7364..43a27c12 100644 --- a/src/javaeva/server/go/problems/regression/RFKoza_GPI_7_3.java +++ b/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFKoza_GPI_7_3_extended.java b/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3_extended.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFKoza_GPI_7_3_extended.java rename to src/eva2/server/go/problems/regression/RFKoza_GPI_7_3_extended.java index 8a6ef900..52f23a85 100644 --- a/src/javaeva/server/go/problems/regression/RFKoza_GPI_7_3_extended.java +++ b/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3_extended.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFRaidl_F1.java b/src/eva2/server/go/problems/regression/RFRaidl_F1.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFRaidl_F1.java rename to src/eva2/server/go/problems/regression/RFRaidl_F1.java index 346704b3..6dc0d6a0 100644 --- a/src/javaeva/server/go/problems/regression/RFRaidl_F1.java +++ b/src/eva2/server/go/problems/regression/RFRaidl_F1.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFRaidl_F2.java b/src/eva2/server/go/problems/regression/RFRaidl_F2.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFRaidl_F2.java rename to src/eva2/server/go/problems/regression/RFRaidl_F2.java index 3e5b5566..4ecb0fde 100644 --- a/src/javaeva/server/go/problems/regression/RFRaidl_F2.java +++ b/src/eva2/server/go/problems/regression/RFRaidl_F2.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFRaidl_F3.java b/src/eva2/server/go/problems/regression/RFRaidl_F3.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFRaidl_F3.java rename to src/eva2/server/go/problems/regression/RFRaidl_F3.java index c2d643ad..96fda405 100644 --- a/src/javaeva/server/go/problems/regression/RFRaidl_F3.java +++ b/src/eva2/server/go/problems/regression/RFRaidl_F3.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/strategies/CHCAdaptiveSearchAlgorithm.java b/src/eva2/server/go/strategies/CHCAdaptiveSearchAlgorithm.java similarity index 94% rename from src/javaeva/server/go/strategies/CHCAdaptiveSearchAlgorithm.java rename to src/eva2/server/go/strategies/CHCAdaptiveSearchAlgorithm.java index d2d81601..34719514 100644 --- a/src/javaeva/server/go/strategies/CHCAdaptiveSearchAlgorithm.java +++ b/src/eva2/server/go/strategies/CHCAdaptiveSearchAlgorithm.java @@ -1,19 +1,20 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBest; -import javaeva.server.go.operators.selection.SelectRandom; -import javaeva.server.go.populations.PBILPopulation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGAIndividual; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectBest; +import eva2.server.go.operators.selection.SelectRandom; +import eva2.server.go.populations.PBILPopulation; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This is an implementation of the CHC Adaptive Search Algorithm by Eselman. It is * limited to binary data and is based on massively distruptive crossover. I'm not * shure whether i've implemented this correctly, but i definetly wasn't able to make @@ -105,7 +106,7 @@ public class CHCAdaptiveSearchAlgorithm implements InterfaceOptimizer, java.io.S * given population of evaluated individuals. */ private Population generateChildren() { - Population result = (Population)this.m_Population.clone(), parents, partners; + Population result = this.m_Population.cloneWithoutInds(), parents, partners; AbstractEAIndividual[] offSprings; AbstractEAIndividual tmpIndy; diff --git a/src/javaeva/server/go/strategies/ClusterBasedNichingEA.java b/src/eva2/server/go/strategies/ClusterBasedNichingEA.java similarity index 97% rename from src/javaeva/server/go/strategies/ClusterBasedNichingEA.java rename to src/eva2/server/go/strategies/ClusterBasedNichingEA.java index 010d227a..3a4edc45 100644 --- a/src/javaeva/server/go/strategies/ClusterBasedNichingEA.java +++ b/src/eva2/server/go/strategies/ClusterBasedNichingEA.java @@ -1,26 +1,27 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.util.ArrayList; -import javaeva.gui.BeanInspector; -import javaeva.gui.Chart2DDPointIconCircle; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Plot; -import javaeva.gui.TopoPlot; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.operators.cluster.ClusteringDensityBased; -import javaeva.server.go.operators.cluster.InterfaceClustering; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESGlobal; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.Interface2DBorderProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.problems.TF1Problem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.gui.BeanInspector; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +import eva2.gui.GraphPointSet; +import eva2.gui.Plot; +import eva2.gui.TopoPlot; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.operators.cluster.ClusteringDensityBased; +import eva2.server.go.operators.cluster.InterfaceClustering; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateESGlobal; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.Interface2DBorderProblem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.problems.TF1Problem; +import eva2.server.go.tools.RandomNumberGenerator; + import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DPointSet; diff --git a/src/javaeva/server/go/strategies/ClusteringHillClimbing.java b/src/eva2/server/go/strategies/ClusteringHillClimbing.java similarity index 95% rename from src/javaeva/server/go/strategies/ClusteringHillClimbing.java rename to src/eva2/server/go/strategies/ClusteringHillClimbing.java index bff75bc7..c5fd2fb7 100644 --- a/src/javaeva/server/go/strategies/ClusteringHillClimbing.java +++ b/src/eva2/server/go/strategies/ClusteringHillClimbing.java @@ -1,16 +1,17 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.io.Serializable; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.operators.mutation.MutateESFixedStepSize; -import javaeva.server.go.operators.postprocess.PostProcess; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.tools.Pair; +import eva2.gui.GenericObjectEditor; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.operators.mutation.MutateESFixedStepSize; +import eva2.server.go.operators.postprocess.PostProcess; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractOptimizationProblem; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.tools.Pair; + /** * The clustering hill climber is similar to a multi-start hill climber. In addition so optimizing diff --git a/src/javaeva/server/go/strategies/DifferentialEvolution.java b/src/eva2/server/go/strategies/DifferentialEvolution.java similarity index 96% rename from src/javaeva/server/go/strategies/DifferentialEvolution.java rename to src/eva2/server/go/strategies/DifferentialEvolution.java index c3597c72..ca4f4d94 100644 --- a/src/javaeva/server/go/strategies/DifferentialEvolution.java +++ b/src/eva2/server/go/strategies/DifferentialEvolution.java @@ -1,17 +1,17 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.operators.selection.replacement.ReplacementCrowding; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.tools.SelectedTag; -import javaeva.tools.Tag; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.operators.selection.replacement.ReplacementCrowding; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.problems.AbstractOptimizationProblem; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; +import eva2.tools.SelectedTag; +import eva2.tools.Tag; /** Differential evolution implementing DE1 and DE2 following the paper of Storm and * Price and the Trigonometric DE published rectently, which doesn't really work that diff --git a/src/javaeva/server/go/strategies/DynamicParticleSwarmOptimization.java b/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java similarity index 97% rename from src/javaeva/server/go/strategies/DynamicParticleSwarmOptimization.java rename to src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java index 803d53a2..7c17e280 100644 --- a/src/javaeva/server/go/strategies/DynamicParticleSwarmOptimization.java +++ b/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java @@ -1,15 +1,15 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.AbstractObjectEditor; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.tools.SelectedTag; +import eva2.gui.GenericObjectEditor; +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; +import eva2.server.go.tools.AbstractObjectEditor; +import eva2.server.go.tools.RandomNumberGenerator; +import eva2.tools.SelectedTag; /** * This extends our particle swarm implementation to dynamic optimization problems. diff --git a/src/javaeva/server/go/strategies/EvolutionStrategies.java b/src/eva2/server/go/strategies/EvolutionStrategies.java similarity index 97% rename from src/javaeva/server/go/strategies/EvolutionStrategies.java rename to src/eva2/server/go/strategies/EvolutionStrategies.java index bfffbc6f..150be548 100644 --- a/src/javaeva/server/go/strategies/EvolutionStrategies.java +++ b/src/eva2/server/go/strategies/EvolutionStrategies.java @@ -1,14 +1,14 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.mutation.MutateESSuccessRule; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.operators.selection.SelectRandom; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.mutation.MutateESSuccessRule; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectBestIndividuals; +import eva2.server.go.operators.selection.SelectRandom; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** Evolution strategies by Rechenberg and Schwefel, but please remember that * this only gives the generation strategy and not the coding. But this is the @@ -138,7 +138,7 @@ public class EvolutionStrategies implements InterfaceOptimizer, java.io.Serializ * given population of evaluated individuals. */ private Population generateChildren() { - Population result = (Population)this.m_Population.clone(), parents; + Population result = this.m_Population.cloneWithoutInds(), parents; AbstractEAIndividual[] offSprings; AbstractEAIndividual tmpIndy; diff --git a/src/javaeva/server/go/strategies/EvolutionStrategiesEditor.java b/src/eva2/server/go/strategies/EvolutionStrategiesEditor.java similarity index 99% rename from src/javaeva/server/go/strategies/EvolutionStrategiesEditor.java rename to src/eva2/server/go/strategies/EvolutionStrategiesEditor.java index dba63727..6d8c1df4 100644 --- a/src/javaeva/server/go/strategies/EvolutionStrategiesEditor.java +++ b/src/eva2/server/go/strategies/EvolutionStrategiesEditor.java @@ -1,4 +1,4 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; //package javaeva.server.oa.go.Strategies; // //import java.awt.BorderLayout; diff --git a/src/javaeva/server/go/strategies/EvolutionaryProgramming.java b/src/eva2/server/go/strategies/EvolutionaryProgramming.java similarity index 93% rename from src/javaeva/server/go/strategies/EvolutionaryProgramming.java rename to src/eva2/server/go/strategies/EvolutionaryProgramming.java index 235a0573..81ef7f4b 100644 --- a/src/javaeva/server/go/strategies/EvolutionaryProgramming.java +++ b/src/eva2/server/go/strategies/EvolutionaryProgramming.java @@ -1,13 +1,13 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectEPTournaments; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectEPTournaments; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** Evolutionary programming by Fogel. Works fine but is actually a quite greedy local search * strategy solely based on mutation. To prevent any confusion, the mutation rate is temporaily @@ -88,7 +88,7 @@ public class EvolutionaryProgramming implements InterfaceOptimizer, java.io.Seri * given population of evaluated individuals. */ private Population generateChildren() { - Population result = (Population)this.m_Population.clone(); + Population result = (Population)this.m_Population.cloneWithoutInds(); AbstractEAIndividual mutant; result.clear(); diff --git a/src/javaeva/server/go/strategies/FloodAlgorithm.java b/src/eva2/server/go/strategies/FloodAlgorithm.java similarity index 96% rename from src/javaeva/server/go/strategies/FloodAlgorithm.java rename to src/eva2/server/go/strategies/FloodAlgorithm.java index ef5ff9e0..07a1d413 100644 --- a/src/javaeva/server/go/strategies/FloodAlgorithm.java +++ b/src/eva2/server/go/strategies/FloodAlgorithm.java @@ -1,11 +1,11 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** The flood algorithm, and alternative to the threshold algorithms. No really * good but commonly known and sometimes even used. Here the problem is to choose diff --git a/src/javaeva/server/go/strategies/GeneticAlgorithm.java b/src/eva2/server/go/strategies/GeneticAlgorithm.java similarity index 90% rename from src/javaeva/server/go/strategies/GeneticAlgorithm.java rename to src/eva2/server/go/strategies/GeneticAlgorithm.java index a32983ef..1d384b04 100644 --- a/src/javaeva/server/go/strategies/GeneticAlgorithm.java +++ b/src/eva2/server/go/strategies/GeneticAlgorithm.java @@ -1,13 +1,13 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectTournament; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectTournament; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** The traditional genetic algorithms as devised by Holland. To only special here * it the plague factor which reduces the population size to tune from a global to @@ -78,29 +78,29 @@ public class GeneticAlgorithm implements InterfaceOptimizer, java.io.Serializabl population.incrGeneration(); } - /** This method will assign fitness values to all individual in the - * current population. - * @param population The population that is to be evaluated - */ - private void defaultEvaluatePopulation(Population population) { - GAIndividualBinaryData tmpIndy; - for (int i = 0; i < population.size(); i++) { - tmpIndy = (GAIndividualBinaryData) population.get(i); - tmpIndy.SetFitness(0, tmpIndy.defaultEvaulateAsMiniBits()); - population.incrFunctionCalls(); - } - population.incrGeneration(); - } +// /** This method will assign fitness values to all individual in the +// * current population. +// * @param population The population that is to be evaluated +// */ +// private void defaultEvaluatePopulation(Population population) { +// GAIndividualBinaryData tmpIndy; +// for (int i = 0; i < population.size(); i++) { +// tmpIndy = (GAIndividualBinaryData) population.get(i); +// tmpIndy.SetFitness(0, tmpIndy.defaultEvaulateAsMiniBits()); +// population.incrFunctionCalls(); +// } +// population.incrGeneration(); +// } /** This method will generate the offspring population from the * given population of evaluated individuals. */ private Population generateChildren() { - Population result = (Population)this.m_Population.clone(), parents; + Population result = m_Population.cloneWithoutInds(); + Population parents; AbstractEAIndividual[] offSprings; AbstractEAIndividual tmpIndy; - result.clear(); //this.m_NormationOperator.computeSelectionProbability(this.m_Population, "Fitness"); //System.out.println("Population:"+this.m_Population.getSolutionRepresentationFor()); this.m_ParentSelection.prepareSelection(this.m_Population); @@ -124,11 +124,10 @@ public class GeneticAlgorithm implements InterfaceOptimizer, java.io.Serializabl public void optimize() { Population nextGeneration; - AbstractEAIndividual elite; nextGeneration = this.generateChildren(); this.evaluatePopulation(nextGeneration); if (this.m_UseElitism) { - elite = this.m_Population.getBestEAIndividual(); + AbstractEAIndividual elite = this.m_Population.getBestEAIndividual(); if (elite != null) { this.m_Population = nextGeneration; this.m_Population.remove(0);// This implements a random replacement strategy for the elite diff --git a/src/javaeva/server/go/strategies/GeneticAlgorithmEditor.java b/src/eva2/server/go/strategies/GeneticAlgorithmEditor.java similarity index 99% rename from src/javaeva/server/go/strategies/GeneticAlgorithmEditor.java rename to src/eva2/server/go/strategies/GeneticAlgorithmEditor.java index 97c67e95..dc1b86d6 100644 --- a/src/javaeva/server/go/strategies/GeneticAlgorithmEditor.java +++ b/src/eva2/server/go/strategies/GeneticAlgorithmEditor.java @@ -1,4 +1,4 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; //package javaeva.server.oa.go.Strategies; // //import javaeva.server.oa.go.Tools.AbstractObjectEditor; diff --git a/src/javaeva/server/go/strategies/GradientDescentAlgorithm.java b/src/eva2/server/go/strategies/GradientDescentAlgorithm.java similarity index 96% rename from src/javaeva/server/go/strategies/GradientDescentAlgorithm.java rename to src/eva2/server/go/strategies/GradientDescentAlgorithm.java index 6c1bf2ac..4e3e1dda 100644 --- a/src/javaeva/server/go/strategies/GradientDescentAlgorithm.java +++ b/src/eva2/server/go/strategies/GradientDescentAlgorithm.java @@ -1,14 +1,15 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.util.*; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceFirstOrderDerivableProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceFirstOrderDerivableProblem; +import eva2.server.go.problems.InterfaceOptimizationProblem; + /** A gradient descent algorithm by hannes planatscher don't expect any diff --git a/src/javaeva/server/go/strategies/HillClimbing.java b/src/eva2/server/go/strategies/HillClimbing.java similarity index 95% rename from src/javaeva/server/go/strategies/HillClimbing.java rename to src/eva2/server/go/strategies/HillClimbing.java index b5309e57..ce398bf4 100644 --- a/src/javaeva/server/go/strategies/HillClimbing.java +++ b/src/eva2/server/go/strategies/HillClimbing.java @@ -1,12 +1,12 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.gui.BeanInspector; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** This is a Multi-Start Hill-Climber, here the population size gives the number of diff --git a/src/javaeva/server/go/strategies/InterfaceOptimizer.java b/src/eva2/server/go/strategies/InterfaceOptimizer.java similarity index 91% rename from src/javaeva/server/go/strategies/InterfaceOptimizer.java rename to src/eva2/server/go/strategies/InterfaceOptimizer.java index 52c9c639..180fb598 100644 --- a/src/javaeva/server/go/strategies/InterfaceOptimizer.java +++ b/src/eva2/server/go/strategies/InterfaceOptimizer.java @@ -1,11 +1,12 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.util.List; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; + /** The general interface for optimizers giving the main methods necessary * to perform a population based search. diff --git a/src/javaeva/server/go/strategies/IslandModelEA.java b/src/eva2/server/go/strategies/IslandModelEA.java similarity index 95% rename from src/javaeva/server/go/strategies/IslandModelEA.java rename to src/eva2/server/go/strategies/IslandModelEA.java index bee15af2..fce569b0 100644 --- a/src/javaeva/server/go/strategies/IslandModelEA.java +++ b/src/eva2/server/go/strategies/IslandModelEA.java @@ -1,19 +1,19 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.operators.migration.InterfaceMigration; -import javaeva.server.go.operators.migration.MOBestMigration; -import javaeva.server.go.operators.migration.MOClusteringSeparation; -import javaeva.server.go.operators.migration.MOConeSeparation; -import javaeva.server.go.operators.migration.SOBestMigration; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.F8Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.problems.TF1Problem; -import javaeva.gui.Plot; -import javaeva.gui.PropertyRemoteServers; +import eva2.gui.Plot; +import eva2.gui.PropertyRemoteServers; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.operators.migration.InterfaceMigration; +import eva2.server.go.operators.migration.MOBestMigration; +import eva2.server.go.operators.migration.MOClusteringSeparation; +import eva2.server.go.operators.migration.MOConeSeparation; +import eva2.server.go.operators.migration.SOBestMigration; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.F8Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.problems.TF1Problem; import wsi.ra.jproxy.RMIProxyRemoteThread; import wsi.ra.jproxy.RMIProxyLocal; import wsi.ra.jproxy.RMIServer; @@ -87,7 +87,7 @@ public class IslandModelEA implements InterfacePopulationChangedEventListener, I double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("Island Model EA", "FitnessCalls", "Fitness", tmpD, tmpD); + this.m_Plot = new eva2.gui.Plot("Island Model EA", "FitnessCalls", "Fitness", tmpD, tmpD); } } @@ -145,7 +145,7 @@ public class IslandModelEA implements InterfacePopulationChangedEventListener, I double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("Island Model EA", "FitnessCalls", "Fitness", tmpD, tmpD); + this.m_Plot = new eva2.gui.Plot("Island Model EA", "FitnessCalls", "Fitness", tmpD, tmpD); } } diff --git a/src/javaeva/server/go/strategies/MemeticAlgorithm.java b/src/eva2/server/go/strategies/MemeticAlgorithm.java similarity index 95% rename from src/javaeva/server/go/strategies/MemeticAlgorithm.java rename to src/eva2/server/go/strategies/MemeticAlgorithm.java index 594d7abb..5d6c40bd 100644 --- a/src/javaeva/server/go/strategies/MemeticAlgorithm.java +++ b/src/eva2/server/go/strategies/MemeticAlgorithm.java @@ -1,15 +1,16 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.util.Hashtable; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceLocalSearchable; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectBestIndividuals; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceLocalSearchable; +import eva2.server.go.problems.InterfaceOptimizationProblem; + /** * A memetic algorithm by hannes planatscher. The local search strategy can only diff --git a/src/javaeva/server/go/strategies/MonteCarloSearch.java b/src/eva2/server/go/strategies/MonteCarloSearch.java similarity index 95% rename from src/javaeva/server/go/strategies/MonteCarloSearch.java rename to src/eva2/server/go/strategies/MonteCarloSearch.java index 0f25e09f..cd1a3d57 100644 --- a/src/javaeva/server/go/strategies/MonteCarloSearch.java +++ b/src/eva2/server/go/strategies/MonteCarloSearch.java @@ -1,11 +1,11 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** The simple random or Monte-Carlo search, simple but useful * to evaluate the complexity of the search space. diff --git a/src/javaeva/server/go/strategies/MultiObjectiveEA.java b/src/eva2/server/go/strategies/MultiObjectiveEA.java similarity index 94% rename from src/javaeva/server/go/strategies/MultiObjectiveEA.java rename to src/eva2/server/go/strategies/MultiObjectiveEA.java index 20598f39..42422431 100644 --- a/src/javaeva/server/go/strategies/MultiObjectiveEA.java +++ b/src/eva2/server/go/strategies/MultiObjectiveEA.java @@ -1,15 +1,15 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.operators.archiving.InformationRetrievalInserting; -import javaeva.server.go.operators.archiving.InterfaceArchiving; -import javaeva.server.go.operators.archiving.InterfaceInformationRetrieval; -import javaeva.server.go.operators.selection.SelectMONonDominated; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.FM0Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingNSGAII; +import eva2.server.go.operators.archiving.InformationRetrievalInserting; +import eva2.server.go.operators.archiving.InterfaceArchiving; +import eva2.server.go.operators.archiving.InterfaceInformationRetrieval; +import eva2.server.go.operators.selection.SelectMONonDominated; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.FM0Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** A generic framework for multi-objecitve optimization, you need * to specify an optimization strategy (like GA), an archiver and diff --git a/src/javaeva/server/go/strategies/MultiObjectiveMemeticAlgorithmII.java b/src/eva2/server/go/strategies/MultiObjectiveMemeticAlgorithmII.java similarity index 91% rename from src/javaeva/server/go/strategies/MultiObjectiveMemeticAlgorithmII.java rename to src/eva2/server/go/strategies/MultiObjectiveMemeticAlgorithmII.java index 018071a6..ac581f5b 100644 --- a/src/javaeva/server/go/strategies/MultiObjectiveMemeticAlgorithmII.java +++ b/src/eva2/server/go/strategies/MultiObjectiveMemeticAlgorithmII.java @@ -1,16 +1,16 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingMOMAIIAllDominating; -import javaeva.server.go.operators.archiving.InformationRetrievalInserting; -import javaeva.server.go.operators.archiving.InterfaceArchiving; -import javaeva.server.go.operators.archiving.InterfaceInformationRetrieval; -import javaeva.server.go.operators.selection.SelectMOMAIIDominanceCounter; -import javaeva.server.go.operators.selection.SelectMONonDominated; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.FM0Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingMOMAIIAllDominating; +import eva2.server.go.operators.archiving.InformationRetrievalInserting; +import eva2.server.go.operators.archiving.InterfaceArchiving; +import eva2.server.go.operators.archiving.InterfaceInformationRetrieval; +import eva2.server.go.operators.selection.SelectMOMAIIDominanceCounter; +import eva2.server.go.operators.selection.SelectMONonDominated; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.FM0Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** This is still under construction. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/strategies/ParticleFilterOptimization.java b/src/eva2/server/go/strategies/ParticleFilterOptimization.java similarity index 93% rename from src/javaeva/server/go/strategies/ParticleFilterOptimization.java rename to src/eva2/server/go/strategies/ParticleFilterOptimization.java index 06681cd4..55777c0f 100644 --- a/src/javaeva/server/go/strategies/ParticleFilterOptimization.java +++ b/src/eva2/server/go/strategies/ParticleFilterOptimization.java @@ -1,20 +1,21 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.Plot; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.operators.mutation.MutateESFixedStepSize; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectXProbRouletteWheel; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; import java.util.ArrayList; +import eva2.gui.GenericObjectEditor; +import eva2.gui.Plot; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.operators.mutation.MutateESFixedStepSize; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectXProbRouletteWheel; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; + /** This is a Particel Filter implemented by Frank Senke, only some documentation * here and not throughfully checked, whether this works on arbitrary problem * instances. @@ -302,7 +303,7 @@ public class ParticleFilterOptimization implements InterfaceOptimizer, java.io.S range[0][1] = 0; range[1] = range[0]; // this is evil } - myPlot = new javaeva.gui.Plot("PF", "x1", "x2", true); + myPlot = new eva2.gui.Plot("PF", "x1", "x2", true); } } diff --git a/src/javaeva/server/go/strategies/ParticleSwarmOptimization.java b/src/eva2/server/go/strategies/ParticleSwarmOptimization.java similarity index 98% rename from src/javaeva/server/go/strategies/ParticleSwarmOptimization.java rename to src/eva2/server/go/strategies/ParticleSwarmOptimization.java index a825ed35..8e04f9e5 100644 --- a/src/javaeva/server/go/strategies/ParticleSwarmOptimization.java +++ b/src/eva2/server/go/strategies/ParticleSwarmOptimization.java @@ -1,29 +1,28 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.util.Arrays; import java.util.Vector; +import eva2.gui.BeanInspector; +import eva2.gui.GenericObjectEditor; +import eva2.gui.TopoPlot; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividualComparator; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.Interface2DBorderProblem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; +import eva2.tools.SelectedTag; + import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DPointSet; import wsi.ra.math.Jama.Matrix; -import javaeva.gui.BeanInspector; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.TopoPlot; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.AbstractEAIndividualComparator; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.Interface2DBorderProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.tools.SelectedTag; -//import javax.vecmath.GVector; -//import javax.vecmath.GMatrix; /** * This implements particle swarm optimization by Kennedy and Eberhardt. @@ -100,7 +99,7 @@ public class ParticleSwarmOptimization implements InterfaceOptimizer, java.io.Se // for debugging only transient private static boolean TRACE = false; transient protected boolean m_Show = false; - transient protected javaeva.gui.Plot m_Plot; + transient protected eva2.gui.Plot m_Plot; public ParticleSwarmOptimization() { @@ -1439,7 +1438,7 @@ public class ParticleSwarmOptimization implements InterfaceOptimizer, java.io.Se double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("PSO "+ m_Population.getGeneration(), "x1", "x2", range[0], range[1]); + this.m_Plot = new eva2.gui.Plot("PSO "+ m_Population.getGeneration(), "x1", "x2", range[0], range[1]); // this.m_Plot.setUnconnectedPoint(range[0][0], range[1][0], 0); // this.m_Plot.setUnconnectedPoint(range[0][1], range[1][1], 0); } diff --git a/src/javaeva/server/go/strategies/PopulationBasedIncrementalLearning.java b/src/eva2/server/go/strategies/PopulationBasedIncrementalLearning.java similarity index 94% rename from src/javaeva/server/go/strategies/PopulationBasedIncrementalLearning.java rename to src/eva2/server/go/strategies/PopulationBasedIncrementalLearning.java index 4afb66de..4a780ee3 100644 --- a/src/javaeva/server/go/strategies/PopulationBasedIncrementalLearning.java +++ b/src/eva2/server/go/strategies/PopulationBasedIncrementalLearning.java @@ -1,15 +1,15 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.populations.PBILPopulation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGAIndividual; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectBestIndividuals; +import eva2.server.go.populations.PBILPopulation; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractOptimizationProblem; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** Population based increamental learning in the PSM by Mommarche * version with also allows to simulate ant systems due to the flexible diff --git a/src/javaeva/server/go/strategies/SimulatedAnnealing.java b/src/eva2/server/go/strategies/SimulatedAnnealing.java similarity index 95% rename from src/javaeva/server/go/strategies/SimulatedAnnealing.java rename to src/eva2/server/go/strategies/SimulatedAnnealing.java index 061b3b80..d6129540 100644 --- a/src/javaeva/server/go/strategies/SimulatedAnnealing.java +++ b/src/eva2/server/go/strategies/SimulatedAnnealing.java @@ -1,12 +1,12 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** Simulated Annealing by Nelder and Mead, a simple yet efficient local search * method. But to become less prone to premature convergence the cooling rate diff --git a/src/javaeva/server/go/strategies/SteadyStateGA.java b/src/eva2/server/go/strategies/SteadyStateGA.java similarity index 93% rename from src/javaeva/server/go/strategies/SteadyStateGA.java rename to src/eva2/server/go/strategies/SteadyStateGA.java index 4879382b..3a1964cc 100644 --- a/src/javaeva/server/go/strategies/SteadyStateGA.java +++ b/src/eva2/server/go/strategies/SteadyStateGA.java @@ -1,15 +1,15 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectTournament; -import javaeva.server.go.operators.selection.replacement.InterfaceReplacement; -import javaeva.server.go.operators.selection.replacement.ReplaceWorst; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectTournament; +import eva2.server.go.operators.selection.replacement.InterfaceReplacement; +import eva2.server.go.operators.selection.replacement.ReplaceWorst; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** A simple implementation of the steady-state GA with variable * replacement schemes. To reduce the logging effort population.size() diff --git a/src/javaeva/server/go/strategies/ThresholdAlgorithm.java b/src/eva2/server/go/strategies/ThresholdAlgorithm.java similarity index 95% rename from src/javaeva/server/go/strategies/ThresholdAlgorithm.java rename to src/eva2/server/go/strategies/ThresholdAlgorithm.java index d9df78ef..e69e1df5 100644 --- a/src/javaeva/server/go/strategies/ThresholdAlgorithm.java +++ b/src/eva2/server/go/strategies/ThresholdAlgorithm.java @@ -1,12 +1,12 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** Threshold accepting algorithm simliar strategy as the flood * algorithm, similar problems. diff --git a/src/javaeva/server/go/strategies/Tribes.java b/src/eva2/server/go/strategies/Tribes.java similarity index 96% rename from src/javaeva/server/go/strategies/Tribes.java rename to src/eva2/server/go/strategies/Tribes.java index 700b6953..eb74f898 100644 --- a/src/javaeva/server/go/strategies/Tribes.java +++ b/src/eva2/server/go/strategies/Tribes.java @@ -1,21 +1,22 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.util.Iterator; import java.util.List; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.problems.InterfaceHasInitRange; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.tribes.TribesExplorer; -import javaeva.server.go.strategies.tribes.TribesParam; -import javaeva.server.go.strategies.tribes.TribesPosition; -import javaeva.server.go.strategies.tribes.TribesSwarm; +import eva2.gui.GenericObjectEditor; +import eva2.server.go.InterfacePopulationChangedEventListener; +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.InterfaceHasInitRange; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.tribes.TribesExplorer; +import eva2.server.go.strategies.tribes.TribesParam; +import eva2.server.go.strategies.tribes.TribesPosition; +import eva2.server.go.strategies.tribes.TribesSwarm; + /** * This is the TRIBES algorithm, an adaptive, parameter-less PSO implementation. @@ -170,7 +171,7 @@ public class Tribes implements InterfaceOptimizer, java.io.Serializable { protected int rangeInitType=1; private boolean m_Show = false; - transient protected javaeva.gui.Plot m_Plot = null; + transient protected eva2.gui.Plot m_Plot = null; // private int useAnchors = 0; // use anchors to detect environment changes? public Object clone() { @@ -355,7 +356,7 @@ public class Tribes implements InterfaceOptimizer, java.io.Serializable { // double[] tmpD = new double[2]; // tmpD[0] = 0; // tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("TRIBES "+ population.getGeneration(), "x1", "x2", range[0], range[1]); + this.m_Plot = new eva2.gui.Plot("TRIBES "+ population.getGeneration(), "x1", "x2", range[0], range[1]); // this.m_Plot.setUnconnectedPoint(range[0][0], range[1][0], 0); // this.m_Plot.setUnconnectedPoint(range[0][1], range[1][1], 0); } diff --git a/src/javaeva/server/go/strategies/WingedMultiObjectiveEA.java b/src/eva2/server/go/strategies/WingedMultiObjectiveEA.java similarity index 93% rename from src/javaeva/server/go/strategies/WingedMultiObjectiveEA.java rename to src/eva2/server/go/strategies/WingedMultiObjectiveEA.java index abdf37e7..0518f077 100644 --- a/src/javaeva/server/go/strategies/WingedMultiObjectiveEA.java +++ b/src/eva2/server/go/strategies/WingedMultiObjectiveEA.java @@ -1,18 +1,18 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.operators.archiving.InformationRetrievalInserting; -import javaeva.server.go.operators.archiving.InterfaceArchiving; -import javaeva.server.go.operators.archiving.InterfaceInformationRetrieval; -import javaeva.server.go.operators.moso.MOSOWeightedFitness; -import javaeva.server.go.operators.selection.SelectMONonDominated; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.FM0Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.gui.PropertyDoubleArray; +import eva2.gui.PropertyDoubleArray; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingNSGAII; +import eva2.server.go.operators.archiving.InformationRetrievalInserting; +import eva2.server.go.operators.archiving.InterfaceArchiving; +import eva2.server.go.operators.archiving.InterfaceInformationRetrieval; +import eva2.server.go.operators.moso.MOSOWeightedFitness; +import eva2.server.go.operators.selection.SelectMONonDominated; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.problems.FM0Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** The winged MOEA was a nice idea, which didn't really work out. * Here a standard MOEA is assisted by n additional local searchers, each diff --git a/src/javaeva/server/go/strategies/tribes/Tribe.java b/src/eva2/server/go/strategies/tribes/Tribe.java similarity index 97% rename from src/javaeva/server/go/strategies/tribes/Tribe.java rename to src/eva2/server/go/strategies/tribes/Tribe.java index ef3ec908..891fe65d 100644 --- a/src/javaeva/server/go/strategies/tribes/Tribe.java +++ b/src/eva2/server/go/strategies/tribes/Tribe.java @@ -1,8 +1,8 @@ -package javaeva.server.go.strategies.tribes; +package eva2.server.go.strategies.tribes; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.Tribes; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.Tribes; +import eva2.server.go.tools.RandomNumberGenerator; public class Tribe implements java.io.Serializable { diff --git a/src/javaeva/server/go/strategies/tribes/TribesExplorer.java b/src/eva2/server/go/strategies/tribes/TribesExplorer.java similarity index 98% rename from src/javaeva/server/go/strategies/tribes/TribesExplorer.java rename to src/eva2/server/go/strategies/tribes/TribesExplorer.java index 2a105aee..82d1c35b 100644 --- a/src/javaeva/server/go/strategies/tribes/TribesExplorer.java +++ b/src/eva2/server/go/strategies/tribes/TribesExplorer.java @@ -1,12 +1,12 @@ -package javaeva.server.go.strategies.tribes; +package eva2.server.go.strategies.tribes; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.Tribes; -import javaeva.server.go.tools.RandomNumberGenerator; +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.InterfaceOptimizationProblem; +import eva2.server.go.strategies.Tribes; +import eva2.server.go.tools.RandomNumberGenerator; public class TribesExplorer extends AbstractEAIndividual implements InterfaceESIndividual, InterfaceDataTypeDouble { /** diff --git a/src/javaeva/server/go/strategies/tribes/TribesMemory.java b/src/eva2/server/go/strategies/tribes/TribesMemory.java similarity index 98% rename from src/javaeva/server/go/strategies/tribes/TribesMemory.java rename to src/eva2/server/go/strategies/tribes/TribesMemory.java index a950c1b1..e6693085 100644 --- a/src/javaeva/server/go/strategies/tribes/TribesMemory.java +++ b/src/eva2/server/go/strategies/tribes/TribesMemory.java @@ -1,4 +1,4 @@ -package javaeva.server.go.strategies.tribes; +package eva2.server.go.strategies.tribes; public class TribesMemory implements java.io.Serializable { /** diff --git a/src/javaeva/server/go/strategies/tribes/TribesParam.java b/src/eva2/server/go/strategies/tribes/TribesParam.java similarity index 95% rename from src/javaeva/server/go/strategies/tribes/TribesParam.java rename to src/eva2/server/go/strategies/tribes/TribesParam.java index fc0f7964..ae37d38c 100644 --- a/src/javaeva/server/go/strategies/tribes/TribesParam.java +++ b/src/eva2/server/go/strategies/tribes/TribesParam.java @@ -1,4 +1,4 @@ -package javaeva.server.go.strategies.tribes; +package eva2.server.go.strategies.tribes; /** * This class for now is used only for keeping the door open to the original diff --git a/src/javaeva/server/go/strategies/tribes/TribesPosition.java b/src/eva2/server/go/strategies/tribes/TribesPosition.java similarity index 99% rename from src/javaeva/server/go/strategies/tribes/TribesPosition.java rename to src/eva2/server/go/strategies/tribes/TribesPosition.java index 131e9679..f9e7d291 100644 --- a/src/javaeva/server/go/strategies/tribes/TribesPosition.java +++ b/src/eva2/server/go/strategies/tribes/TribesPosition.java @@ -1,9 +1,10 @@ -package javaeva.server.go.strategies.tribes; +package eva2.server.go.strategies.tribes; import java.util.Arrays; -import javaeva.server.go.strategies.Tribes; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.strategies.Tribes; +import eva2.server.go.tools.RandomNumberGenerator; + public class TribesPosition implements java.io.Serializable { /** diff --git a/src/javaeva/server/go/strategies/tribes/TribesSwarm.java b/src/eva2/server/go/strategies/tribes/TribesSwarm.java similarity index 99% rename from src/javaeva/server/go/strategies/tribes/TribesSwarm.java rename to src/eva2/server/go/strategies/tribes/TribesSwarm.java index a53939a5..8d76758a 100644 --- a/src/javaeva/server/go/strategies/tribes/TribesSwarm.java +++ b/src/eva2/server/go/strategies/tribes/TribesSwarm.java @@ -1,12 +1,13 @@ -package javaeva.server.go.strategies.tribes; +package eva2.server.go.strategies.tribes; import java.util.ArrayList; import java.util.List; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.Tribes; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.Tribes; +import eva2.server.go.tools.RandomNumberGenerator; + public class TribesSwarm implements java.io.Serializable{ /** diff --git a/src/javaeva/server/go/tools/AbstractObjectEditor.java b/src/eva2/server/go/tools/AbstractObjectEditor.java similarity index 99% rename from src/javaeva/server/go/tools/AbstractObjectEditor.java rename to src/eva2/server/go/tools/AbstractObjectEditor.java index b536b060..95015014 100644 --- a/src/javaeva/server/go/tools/AbstractObjectEditor.java +++ b/src/eva2/server/go/tools/AbstractObjectEditor.java @@ -1,10 +1,12 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.client.EvAClient; -import javaeva.gui.*; -import javaeva.tools.EVAHELP; import javax.swing.*; + +import eva2.client.EvAClient; +import eva2.gui.*; +import eva2.tools.EVAHELP; + import java.beans.*; import java.io.File; import java.lang.reflect.Method; diff --git a/src/javaeva/server/go/tools/DeNovofilter.java b/src/eva2/server/go/tools/DeNovofilter.java similarity index 87% rename from src/javaeva/server/go/tools/DeNovofilter.java rename to src/eva2/server/go/tools/DeNovofilter.java index 5909da18..c4874573 100644 --- a/src/javaeva/server/go/tools/DeNovofilter.java +++ b/src/eva2/server/go/tools/DeNovofilter.java @@ -1,14 +1,15 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; import java.io.BufferedReader; import java.io.FileReader; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.operators.archiving.ArchivingAllDominating; +import eva2.server.go.populations.Population; + /** * Created by IntelliJ IDEA. * User: streiche @@ -43,7 +44,7 @@ public class DeNovofilter { } private void loadData() { pop = new Population(); - ESIndividualDoubleData indy; + AbstractEAIndividual indy; BufferedReader reader= null; try { reader = new BufferedReader(new FileReader("TEST.txt")); diff --git a/src/javaeva/server/go/tools/FileLoader.java b/src/eva2/server/go/tools/FileLoader.java similarity index 98% rename from src/javaeva/server/go/tools/FileLoader.java rename to src/eva2/server/go/tools/FileLoader.java index ebcb70dc..c271521d 100644 --- a/src/javaeva/server/go/tools/FileLoader.java +++ b/src/eva2/server/go/tools/FileLoader.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import wsi.ra.tool.BasicResourceLoader; diff --git a/src/javaeva/server/go/tools/GONamingBox.java b/src/eva2/server/go/tools/GONamingBox.java similarity index 98% rename from src/javaeva/server/go/tools/GONamingBox.java rename to src/eva2/server/go/tools/GONamingBox.java index 5db6ef4c..368fba7f 100644 --- a/src/javaeva/server/go/tools/GONamingBox.java +++ b/src/eva2/server/go/tools/GONamingBox.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/tools/GeneralGEOFaker.java b/src/eva2/server/go/tools/GeneralGEOFaker.java similarity index 99% rename from src/javaeva/server/go/tools/GeneralGEOFaker.java rename to src/eva2/server/go/tools/GeneralGEOFaker.java index 8bb38029..d9fad101 100644 --- a/src/javaeva/server/go/tools/GeneralGEOFaker.java +++ b/src/eva2/server/go/tools/GeneralGEOFaker.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import javax.swing.*; import java.awt.*; diff --git a/src/javaeva/server/go/tools/GeneralGOEProperty.java b/src/eva2/server/go/tools/GeneralGOEProperty.java similarity index 95% rename from src/javaeva/server/go/tools/GeneralGOEProperty.java rename to src/eva2/server/go/tools/GeneralGOEProperty.java index 232e9d74..d66fc922 100644 --- a/src/javaeva/server/go/tools/GeneralGOEProperty.java +++ b/src/eva2/server/go/tools/GeneralGOEProperty.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import javax.swing.*; import java.lang.reflect.Method; diff --git a/src/javaeva/server/go/tools/GeneralGenericObjectEditorPanel.java b/src/eva2/server/go/tools/GeneralGenericObjectEditorPanel.java similarity index 98% rename from src/javaeva/server/go/tools/GeneralGenericObjectEditorPanel.java rename to src/eva2/server/go/tools/GeneralGenericObjectEditorPanel.java index c80fd3b3..ab41c7f6 100644 --- a/src/javaeva/server/go/tools/GeneralGenericObjectEditorPanel.java +++ b/src/eva2/server/go/tools/GeneralGenericObjectEditorPanel.java @@ -1,10 +1,12 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.PropertyDialog; -import javaeva.tools.EVAHELP; import javax.swing.*; + +import eva2.gui.GenericObjectEditor; +import eva2.gui.PropertyDialog; +import eva2.tools.EVAHELP; + import java.awt.event.ItemListener; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/tools/ImpactOfDimensionOnMOEAs.java b/src/eva2/server/go/tools/ImpactOfDimensionOnMOEAs.java similarity index 87% rename from src/javaeva/server/go/tools/ImpactOfDimensionOnMOEAs.java rename to src/eva2/server/go/tools/ImpactOfDimensionOnMOEAs.java index b40178eb..9e9d0d06 100644 --- a/src/javaeva/server/go/tools/ImpactOfDimensionOnMOEAs.java +++ b/src/eva2/server/go/tools/ImpactOfDimensionOnMOEAs.java @@ -1,16 +1,17 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.gui.Plot; -import javaeva.gui.GraphPointSet; import wsi.ra.chart2d.DPoint; import java.io.*; +import eva2.gui.GraphPointSet; +import eva2.gui.Plot; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.operators.archiving.ArchivingAllDominating; +import eva2.server.go.populations.Population; + /** * Created by IntelliJ IDEA. * User: streiche @@ -36,7 +37,7 @@ public class ImpactOfDimensionOnMOEAs { double[] tmpD = new double[2]; tmpD[0] = 1; tmpD[1] = 1; - mPlot = new javaeva.gui.Plot("ImpactOfDimensionOnMOEAs", "ProblemDimensin", "No. of Pareto-opt solutions", true); + mPlot = new eva2.gui.Plot("ImpactOfDimensionOnMOEAs", "ProblemDimensin", "No. of Pareto-opt solutions", true); for (int l = 0; l < 5; l++) { popSize = 100 + (l*100); mySet = new GraphPointSet(l, mPlot.getFunctionArea()); @@ -95,12 +96,12 @@ public class ImpactOfDimensionOnMOEAs { } public void initPopulation(Population pop, int popSize, int numberOfVariables) { - ESIndividualDoubleData tmpIndy, template; + AbstractEAIndividual tmpIndy, template; pop.clear(); template = new ESIndividualDoubleData(); ((InterfaceDataTypeDouble)template).setDoubleDataLength(numberOfVariables); for (int i = 0; i < popSize; i++) { - tmpIndy = (ESIndividualDoubleData)template.clone(); + tmpIndy = (AbstractEAIndividual)template.clone(); tmpIndy.init(null); pop.add(tmpIndy); } diff --git a/src/javaeva/server/go/tools/InterfaceTest.java b/src/eva2/server/go/tools/InterfaceTest.java similarity index 84% rename from src/javaeva/server/go/tools/InterfaceTest.java rename to src/eva2/server/go/tools/InterfaceTest.java index 3d5806a9..0714bacf 100644 --- a/src/javaeva/server/go/tools/InterfaceTest.java +++ b/src/eva2/server/go/tools/InterfaceTest.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/tools/ModuloTest.java b/src/eva2/server/go/tools/ModuloTest.java similarity index 94% rename from src/javaeva/server/go/tools/ModuloTest.java rename to src/eva2/server/go/tools/ModuloTest.java index a6a51f1c..87d2ea76 100644 --- a/src/javaeva/server/go/tools/ModuloTest.java +++ b/src/eva2/server/go/tools/ModuloTest.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/tools/ParetoFrontLocalTester.java b/src/eva2/server/go/tools/ParetoFrontLocalTester.java similarity index 95% rename from src/javaeva/server/go/tools/ParetoFrontLocalTester.java rename to src/eva2/server/go/tools/ParetoFrontLocalTester.java index 39f70fe7..db53b9e3 100644 --- a/src/javaeva/server/go/tools/ParetoFrontLocalTester.java +++ b/src/eva2/server/go/tools/ParetoFrontLocalTester.java @@ -1,10 +1,11 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.gui.GraphPointSet; import java.util.ArrayList; import java.io.*; +import eva2.gui.GraphPointSet; + /** * Created by IntelliJ IDEA. * User: streiche @@ -14,7 +15,7 @@ import java.io.*; */ public class ParetoFrontLocalTester { - private javaeva.gui.Plot m_Plot; + private eva2.gui.Plot m_Plot; private int index = 0; private BufferedWriter m_OutputFile = null; @@ -148,7 +149,7 @@ public class ParetoFrontLocalTester { double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("Multiobjective Optimization", "Y1", "Y2", tmpD, tmpD); + this.m_Plot = new eva2.gui.Plot("Multiobjective Optimization", "Y1", "Y2", tmpD, tmpD); } diff --git a/src/javaeva/server/go/tools/PortfolioFrontTester.java b/src/eva2/server/go/tools/PortfolioFrontTester.java similarity index 98% rename from src/javaeva/server/go/tools/PortfolioFrontTester.java rename to src/eva2/server/go/tools/PortfolioFrontTester.java index bb3c3fb4..54875177 100644 --- a/src/javaeva/server/go/tools/PortfolioFrontTester.java +++ b/src/eva2/server/go/tools/PortfolioFrontTester.java @@ -1,10 +1,11 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.gui.GraphPointSet; import java.io.*; import java.util.ArrayList; +import eva2.gui.GraphPointSet; + /** * Created by IntelliJ IDEA. * User: streiche @@ -14,7 +15,7 @@ import java.util.ArrayList; */ public class PortfolioFrontTester { - private javaeva.gui.Plot m_Plot; + private eva2.gui.Plot m_Plot; private int index = 0; private BufferedWriter m_OutputFile = null; private double[] loss; @@ -316,7 +317,7 @@ public class PortfolioFrontTester { double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("Multiobjective Optimization", "Y1", "Y2", tmpD, tmpD); + this.m_Plot = new eva2.gui.Plot("Multiobjective Optimization", "Y1", "Y2", tmpD, tmpD); } diff --git a/src/javaeva/server/go/tools/RandomNumberGenerator.java b/src/eva2/server/go/tools/RandomNumberGenerator.java similarity index 99% rename from src/javaeva/server/go/tools/RandomNumberGenerator.java rename to src/eva2/server/go/tools/RandomNumberGenerator.java index 291381ba..4c9b1bc4 100644 --- a/src/javaeva/server/go/tools/RandomNumberGenerator.java +++ b/src/eva2/server/go/tools/RandomNumberGenerator.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import java.util.Random; import java.util.ArrayList; diff --git a/src/javaeva/server/go/tools/Test1.java b/src/eva2/server/go/tools/Test1.java similarity index 96% rename from src/javaeva/server/go/tools/Test1.java rename to src/eva2/server/go/tools/Test1.java index 3154eb8a..52ce7690 100644 --- a/src/javaeva/server/go/tools/Test1.java +++ b/src/eva2/server/go/tools/Test1.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import java.io.Serializable; diff --git a/src/javaeva/server/go/tools/Test2.java b/src/eva2/server/go/tools/Test2.java similarity index 97% rename from src/javaeva/server/go/tools/Test2.java rename to src/eva2/server/go/tools/Test2.java index f8771898..0024f593 100644 --- a/src/javaeva/server/go/tools/Test2.java +++ b/src/eva2/server/go/tools/Test2.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import java.io.Serializable; diff --git a/src/javaeva/server/go/tools/Test3.java b/src/eva2/server/go/tools/Test3.java similarity index 87% rename from src/javaeva/server/go/tools/Test3.java rename to src/eva2/server/go/tools/Test3.java index daef7c89..1648fd07 100644 --- a/src/javaeva/server/go/tools/Test3.java +++ b/src/eva2/server/go/tools/Test3.java @@ -1,16 +1,17 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.operators.crossover.CrossoverGANPoint; -import javaeva.server.go.operators.crossover.CrossoverGAUniform; -import javaeva.server.go.operators.mutation.MutateGADefault; -import javaeva.server.go.operators.mutation.MutateGAStandard; -import javaeva.server.go.problems.F1Problem; import java.io.*; import java.beans.XMLEncoder; import java.beans.XMLDecoder; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.operators.crossover.CrossoverGANPoint; +import eva2.server.go.operators.crossover.CrossoverGAUniform; +import eva2.server.go.operators.mutation.MutateGADefault; +import eva2.server.go.operators.mutation.MutateGAStandard; +import eva2.server.go.problems.F1Problem; + public class Test3 { public static void main(String[] args) { diff --git a/src/javaeva/server/go/tools/Test4.java b/src/eva2/server/go/tools/Test4.java similarity index 95% rename from src/javaeva/server/go/tools/Test4.java rename to src/eva2/server/go/tools/Test4.java index 82988f8b..f0a70ae1 100644 --- a/src/javaeva/server/go/tools/Test4.java +++ b/src/eva2/server/go/tools/Test4.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/tools/Test5.java b/src/eva2/server/go/tools/Test5.java similarity index 98% rename from src/javaeva/server/go/tools/Test5.java rename to src/eva2/server/go/tools/Test5.java index 1d04a205..8a892482 100644 --- a/src/javaeva/server/go/tools/Test5.java +++ b/src/eva2/server/go/tools/Test5.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import java.io.*; diff --git a/src/javaeva/server/go/tools/TestingDArea.java b/src/eva2/server/go/tools/TestingDArea.java similarity index 97% rename from src/javaeva/server/go/tools/TestingDArea.java rename to src/eva2/server/go/tools/TestingDArea.java index 513f2688..26d6cbf7 100644 --- a/src/javaeva/server/go/tools/TestingDArea.java +++ b/src/eva2/server/go/tools/TestingDArea.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import wsi.ra.chart2d.*; diff --git a/src/javaeva/server/go/tools/entity.java b/src/eva2/server/go/tools/entity.java similarity index 96% rename from src/javaeva/server/go/tools/entity.java rename to src/eva2/server/go/tools/entity.java index db9fa9d2..17909c72 100644 --- a/src/javaeva/server/go/tools/entity.java +++ b/src/eva2/server/go/tools/entity.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/tools/point.java b/src/eva2/server/go/tools/point.java similarity index 96% rename from src/javaeva/server/go/tools/point.java rename to src/eva2/server/go/tools/point.java index c2bbe68a..dea0d81c 100644 --- a/src/javaeva/server/go/tools/point.java +++ b/src/eva2/server/go/tools/point.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/AbstractGOParameters.java b/src/eva2/server/modules/AbstractGOParameters.java similarity index 92% rename from src/javaeva/server/modules/AbstractGOParameters.java rename to src/eva2/server/modules/AbstractGOParameters.java index 4238b77a..af25a6bb 100644 --- a/src/javaeva/server/modules/AbstractGOParameters.java +++ b/src/eva2/server/modules/AbstractGOParameters.java @@ -1,15 +1,16 @@ -package javaeva.server.modules; +package eva2.server.modules; import java.io.Serializable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.postprocess.InterfacePostProcessParams; -import javaeva.server.go.operators.postprocess.PostProcessParams; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.operators.postprocess.InterfacePostProcessParams; +import eva2.server.go.operators.postprocess.PostProcessParams; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.InterfaceOptimizer; + public abstract class AbstractGOParameters implements InterfaceGOParameters, Serializable { public static boolean TRACE = false; diff --git a/src/javaeva/server/modules/AbstractModuleAdapter.java b/src/eva2/server/modules/AbstractModuleAdapter.java similarity index 97% rename from src/javaeva/server/modules/AbstractModuleAdapter.java rename to src/eva2/server/modules/AbstractModuleAdapter.java index e02fe802..63a4b92d 100644 --- a/src/javaeva/server/modules/AbstractModuleAdapter.java +++ b/src/eva2/server/modules/AbstractModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; /* * Title: JavaEvA * Description: @@ -16,9 +16,10 @@ import java.io.Serializable; import java.net.InetAddress; import java.util.Vector; -import javaeva.gui.JTabbedModuleFrame; -import javaeva.gui.LogPanel; -import javaeva.server.go.InterfaceProcessor; +import eva2.gui.JTabbedModuleFrame; +import eva2.gui.LogPanel; +import eva2.server.go.InterfaceProcessor; + import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.RemoteStateListener; /*==========================================================================* diff --git a/src/javaeva/server/modules/DEModuleAdapter.java b/src/eva2/server/modules/DEModuleAdapter.java similarity index 91% rename from src/javaeva/server/modules/DEModuleAdapter.java rename to src/eva2/server/modules/DEModuleAdapter.java index 5241e510..75323064 100644 --- a/src/javaeva/server/modules/DEModuleAdapter.java +++ b/src/eva2/server/modules/DEModuleAdapter.java @@ -1,6 +1,6 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.gui.GenericObjectEditor; +import eva2.gui.GenericObjectEditor; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/DEParameters.java b/src/eva2/server/modules/DEParameters.java similarity index 84% rename from src/javaeva/server/modules/DEParameters.java rename to src/eva2/server/modules/DEParameters.java index 47a0c62c..60dda4b3 100644 --- a/src/javaeva/server/modules/DEParameters.java +++ b/src/eva2/server/modules/DEParameters.java @@ -1,21 +1,22 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.DifferentialEvolution; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.tools.Serializer; -import javaeva.tools.SelectedTag; import java.io.Serializable; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.DifferentialEvolution; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.tools.SelectedTag; +import eva2.tools.Serializer; + /** The class gives access to all DE parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/EPModuleAdapter.java b/src/eva2/server/modules/EPModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/EPModuleAdapter.java rename to src/eva2/server/modules/EPModuleAdapter.java index 563f9acb..1171c9a9 100644 --- a/src/javaeva/server/modules/EPModuleAdapter.java +++ b/src/eva2/server/modules/EPModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/EPParameters.java b/src/eva2/server/modules/EPParameters.java similarity index 82% rename from src/javaeva/server/modules/EPParameters.java rename to src/eva2/server/modules/EPParameters.java index 4be1a1a7..cfe45b9c 100644 --- a/src/javaeva/server/modules/EPParameters.java +++ b/src/eva2/server/modules/EPParameters.java @@ -1,19 +1,20 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.EvolutionaryProgramming; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.tools.Serializer; import java.io.Serializable; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.EvolutionaryProgramming; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.tools.Serializer; + /** The class gives access to all EP parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/GAModuleAdapter.java b/src/eva2/server/modules/GAModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/GAModuleAdapter.java rename to src/eva2/server/modules/GAModuleAdapter.java index d7978c9a..65a4d531 100644 --- a/src/javaeva/server/modules/GAModuleAdapter.java +++ b/src/eva2/server/modules/GAModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/GAParameters.java b/src/eva2/server/modules/GAParameters.java similarity index 87% rename from src/javaeva/server/modules/GAParameters.java rename to src/eva2/server/modules/GAParameters.java index 8c690bd8..3c033360 100644 --- a/src/javaeva/server/modules/GAParameters.java +++ b/src/eva2/server/modules/GAParameters.java @@ -1,20 +1,21 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.HillClimbing; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.tools.Serializer; import java.io.Serializable; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.HillClimbing; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.tools.Serializer; + /** The class gives access to all GA parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/GOModuleAdapter.java b/src/eva2/server/modules/GOModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/GOModuleAdapter.java rename to src/eva2/server/modules/GOModuleAdapter.java index 50636acf..8c1d13df 100644 --- a/src/javaeva/server/modules/GOModuleAdapter.java +++ b/src/eva2/server/modules/GOModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import java.io.Serializable; diff --git a/src/javaeva/server/modules/GOParameters.java b/src/eva2/server/modules/GOParameters.java similarity index 81% rename from src/javaeva/server/modules/GOParameters.java rename to src/eva2/server/modules/GOParameters.java index eef55398..1e38b0eb 100644 --- a/src/javaeva/server/modules/GOParameters.java +++ b/src/eva2/server/modules/GOParameters.java @@ -1,14 +1,15 @@ -package javaeva.server.modules; +package eva2.server.modules; import java.io.Serializable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.tools.Serializer; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.tools.Serializer; + /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/GenericModuleAdapter.java b/src/eva2/server/modules/GenericModuleAdapter.java similarity index 89% rename from src/javaeva/server/modules/GenericModuleAdapter.java rename to src/eva2/server/modules/GenericModuleAdapter.java index a83ed152..cd81e88a 100644 --- a/src/javaeva/server/modules/GenericModuleAdapter.java +++ b/src/eva2/server/modules/GenericModuleAdapter.java @@ -1,18 +1,19 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.stat.StatisticsWithGUI; -import javaeva.server.stat.InterfaceStatisticsParameter; -import javaeva.server.EvAServer; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.JTabbedModuleFrame; -import javaeva.gui.JModuleGeneralPanel; -import javaeva.gui.JParaPanel; import java.io.Serializable; import java.lang.reflect.Proxy; import java.util.ArrayList; +import eva2.gui.GenericObjectEditor; +import eva2.gui.JModuleGeneralPanel; +import eva2.gui.JParaPanel; +import eva2.gui.JTabbedModuleFrame; +import eva2.server.EvAServer; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.stat.InterfaceStatisticsParameter; +import eva2.server.stat.StatisticsWithGUI; + import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.RMIProxyLocal; diff --git a/src/javaeva/server/modules/HCModuleAdapter.java b/src/eva2/server/modules/HCModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/HCModuleAdapter.java rename to src/eva2/server/modules/HCModuleAdapter.java index 50d07a21..5150a3cd 100644 --- a/src/javaeva/server/modules/HCModuleAdapter.java +++ b/src/eva2/server/modules/HCModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/HCParameters.java b/src/eva2/server/modules/HCParameters.java similarity index 79% rename from src/javaeva/server/modules/HCParameters.java rename to src/eva2/server/modules/HCParameters.java index 093752a2..12ca2109 100644 --- a/src/javaeva/server/modules/HCParameters.java +++ b/src/eva2/server/modules/HCParameters.java @@ -1,17 +1,18 @@ -package javaeva.server.modules; +package eva2.server.modules; import java.io.Serializable; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.HillClimbing; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.tools.Serializer; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.HillClimbing; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.tools.Serializer; + /** The class gives access to all HC parameters for the JavaEvA * top level GUI. diff --git a/src/javaeva/server/modules/MCModuleAdapter.java b/src/eva2/server/modules/MCModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/MCModuleAdapter.java rename to src/eva2/server/modules/MCModuleAdapter.java index dbf6c3f9..64bcefe5 100644 --- a/src/javaeva/server/modules/MCModuleAdapter.java +++ b/src/eva2/server/modules/MCModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/MCParameters.java b/src/eva2/server/modules/MCParameters.java similarity index 77% rename from src/javaeva/server/modules/MCParameters.java rename to src/eva2/server/modules/MCParameters.java index bb464773..0f6be120 100644 --- a/src/javaeva/server/modules/MCParameters.java +++ b/src/eva2/server/modules/MCParameters.java @@ -1,19 +1,20 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MonteCarloSearch; -import javaeva.tools.Serializer; import java.io.Serializable; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.MonteCarloSearch; +import eva2.tools.Serializer; + /** The class gives access to all HC parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/MOEAModuleAdapter.java b/src/eva2/server/modules/MOEAModuleAdapter.java similarity index 76% rename from src/javaeva/server/modules/MOEAModuleAdapter.java rename to src/eva2/server/modules/MOEAModuleAdapter.java index e8dc7fbf..a64013d0 100644 --- a/src/javaeva/server/modules/MOEAModuleAdapter.java +++ b/src/eva2/server/modules/MOEAModuleAdapter.java @@ -1,16 +1,17 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.stat.StatisticsWithGUI; -import javaeva.server.stat.InterfaceStatisticsParameter; -import javaeva.server.EvAServer; -import javaeva.gui.JTabbedModuleFrame; -import javaeva.gui.JModuleGeneralPanel; -import javaeva.gui.JParaPanel; import java.io.Serializable; import java.util.ArrayList; +import eva2.gui.JModuleGeneralPanel; +import eva2.gui.JParaPanel; +import eva2.gui.JTabbedModuleFrame; +import eva2.server.EvAServer; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.stat.InterfaceStatisticsParameter; +import eva2.server.stat.StatisticsWithGUI; + import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.RMIProxyLocal; diff --git a/src/javaeva/server/modules/MOEAParameters.java b/src/eva2/server/modules/MOEAParameters.java similarity index 84% rename from src/javaeva/server/modules/MOEAParameters.java rename to src/eva2/server/modules/MOEAParameters.java index 8d349e06..b114babd 100644 --- a/src/javaeva/server/modules/MOEAParameters.java +++ b/src/eva2/server/modules/MOEAParameters.java @@ -1,23 +1,24 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.archiving.InterfaceArchiving; -import javaeva.server.go.operators.archiving.InterfaceInformationRetrieval; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.problems.TF1Problem; -import javaeva.server.go.strategies.DifferentialEvolution; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; -import javaeva.tools.Serializer; -import javaeva.tools.SelectedTag; import java.io.Serializable; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.operators.archiving.InterfaceArchiving; +import eva2.server.go.operators.archiving.InterfaceInformationRetrieval; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.problems.TF1Problem; +import eva2.server.go.strategies.DifferentialEvolution; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.MultiObjectiveEA; +import eva2.tools.SelectedTag; +import eva2.tools.Serializer; + /** The class gives access to all MOEA parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/ModuleAdapter.java b/src/eva2/server/modules/ModuleAdapter.java similarity index 88% rename from src/javaeva/server/modules/ModuleAdapter.java rename to src/eva2/server/modules/ModuleAdapter.java index db34626c..8fa2709c 100644 --- a/src/javaeva/server/modules/ModuleAdapter.java +++ b/src/eva2/server/modules/ModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; /* * Title: JavaEvA * Description: @@ -12,10 +12,10 @@ package javaeva.server.modules; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.gui.JTabbedModuleFrame; -import javaeva.gui.LogPanel; -import javaeva.server.go.operators.postprocess.PostProcessParams; -import javaeva.server.stat.InterfaceTextListener; +import eva2.gui.JTabbedModuleFrame; +import eva2.gui.LogPanel; +import eva2.server.go.operators.postprocess.PostProcessParams; +import eva2.server.stat.InterfaceTextListener; import wsi.ra.jproxy.RemoteStateListener; /*==========================================================================* * INTERFACE DECLARATION diff --git a/src/javaeva/server/modules/PBILModuleAdapter.java b/src/eva2/server/modules/PBILModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/PBILModuleAdapter.java rename to src/eva2/server/modules/PBILModuleAdapter.java index 84a7acdf..56637d80 100644 --- a/src/javaeva/server/modules/PBILModuleAdapter.java +++ b/src/eva2/server/modules/PBILModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/PBILParameters.java b/src/eva2/server/modules/PBILParameters.java similarity index 90% rename from src/javaeva/server/modules/PBILParameters.java rename to src/eva2/server/modules/PBILParameters.java index e04a6795..a4ef1fe9 100644 --- a/src/javaeva/server/modules/PBILParameters.java +++ b/src/eva2/server/modules/PBILParameters.java @@ -1,16 +1,17 @@ -package javaeva.server.modules; +package eva2.server.modules; import java.io.Serializable; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.PopulationBasedIncrementalLearning; -import javaeva.tools.Serializer; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.PopulationBasedIncrementalLearning; +import eva2.tools.Serializer; + /** The class gives access to all PBIL parameters for the JavaEvA * top level GUI. diff --git a/src/javaeva/server/modules/PSOModuleAdapter.java b/src/eva2/server/modules/PSOModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/PSOModuleAdapter.java rename to src/eva2/server/modules/PSOModuleAdapter.java index d61bd13c..69fc446a 100644 --- a/src/javaeva/server/modules/PSOModuleAdapter.java +++ b/src/eva2/server/modules/PSOModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/PSOParameters.java b/src/eva2/server/modules/PSOParameters.java similarity index 91% rename from src/javaeva/server/modules/PSOParameters.java rename to src/eva2/server/modules/PSOParameters.java index c022d2e4..16b4332e 100644 --- a/src/javaeva/server/modules/PSOParameters.java +++ b/src/eva2/server/modules/PSOParameters.java @@ -1,23 +1,24 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.ParticleSwarmOptimization; -import javaeva.server.go.strategies.PopulationBasedIncrementalLearning; -import javaeva.tools.Serializer; -import javaeva.tools.SelectedTag; import java.io.Serializable; +import eva2.gui.GenericObjectEditor; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.ParticleSwarmOptimization; +import eva2.server.go.strategies.PopulationBasedIncrementalLearning; +import eva2.tools.SelectedTag; +import eva2.tools.Serializer; + /** The class gives access to all PSO parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/Processor.java b/src/eva2/server/modules/Processor.java similarity index 92% rename from src/javaeva/server/modules/Processor.java rename to src/eva2/server/modules/Processor.java index c820e1f8..31db9b8c 100644 --- a/src/javaeva/server/modules/Processor.java +++ b/src/eva2/server/modules/Processor.java @@ -1,20 +1,21 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.gui.BeanInspector; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceProcessor; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.operators.postprocess.PostProcess; -import javaeva.server.go.operators.postprocess.PostProcessParams; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.operators.terminators.GenerationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.server.stat.InterfaceStatistics; -import javaeva.server.stat.InterfaceTextListener; -import javaeva.server.stat.StatisticsWithGUI; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceProcessor; +import eva2.server.go.PopulationInterface; +import eva2.server.go.operators.postprocess.PostProcess; +import eva2.server.go.operators.postprocess.PostProcessParams; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.operators.terminators.GenerationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; +import eva2.server.stat.InterfaceStatistics; +import eva2.server.stat.InterfaceTextListener; +import eva2.server.stat.StatisticsWithGUI; +import eva2.tools.EVAERROR; import wsi.ra.jproxy.RemoteStateListener; /** @@ -134,6 +135,7 @@ public class Processor extends Thread implements InterfaceProcessor, InterfacePo public Population runOptOnce() { try { + EVAERROR.clearMsgCache(); while (isOptRunning()) { setPriority(3); if (saveParams) goParams.saveInstance(); @@ -193,6 +195,7 @@ public class Processor extends Thread implements InterfaceProcessor, InterfacePo this.goParams.getOptimizer().optimize(); // registerPopulationStateChanged *SHOULD* be fired by the optimizer or resp. the population // as we are event listener +// System.out.println(this.goParams.getOptimizer().getPopulation().getIndyList()); } while (isOptRunning() && !this.goParams.getTerminator().isTerminated(this.goParams.getOptimizer().getPopulation())); runCounter++; diff --git a/src/javaeva/server/modules/SAModuleAdapter.java b/src/eva2/server/modules/SAModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/SAModuleAdapter.java rename to src/eva2/server/modules/SAModuleAdapter.java index 7804077c..4a299568 100644 --- a/src/javaeva/server/modules/SAModuleAdapter.java +++ b/src/eva2/server/modules/SAModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/SAParameters.java b/src/eva2/server/modules/SAParameters.java similarity index 84% rename from src/javaeva/server/modules/SAParameters.java rename to src/eva2/server/modules/SAParameters.java index a966037f..20f21088 100644 --- a/src/javaeva/server/modules/SAParameters.java +++ b/src/eva2/server/modules/SAParameters.java @@ -1,20 +1,21 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MonteCarloSearch; -import javaeva.server.go.strategies.SimulatedAnnealing; -import javaeva.tools.Serializer; import java.io.Serializable; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.MonteCarloSearch; +import eva2.server.go.strategies.SimulatedAnnealing; +import eva2.tools.Serializer; + /** The class gives access to all SA parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/SSGAModuleAdapter.java b/src/eva2/server/modules/SSGAModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/SSGAModuleAdapter.java rename to src/eva2/server/modules/SSGAModuleAdapter.java index 7ec92a73..06188efd 100644 --- a/src/javaeva/server/modules/SSGAModuleAdapter.java +++ b/src/eva2/server/modules/SSGAModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/SSGAParameters.java b/src/eva2/server/modules/SSGAParameters.java similarity index 86% rename from src/javaeva/server/modules/SSGAParameters.java rename to src/eva2/server/modules/SSGAParameters.java index b2e509d9..04839aa1 100644 --- a/src/javaeva/server/modules/SSGAParameters.java +++ b/src/eva2/server/modules/SSGAParameters.java @@ -1,20 +1,21 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.replacement.InterfaceReplacement; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.SteadyStateGA; -import javaeva.tools.Serializer; import java.io.Serializable; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.replacement.InterfaceReplacement; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.SteadyStateGA; +import eva2.tools.Serializer; + /** The class gives access to all SSGA parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/stat/AbstractStatistics.java b/src/eva2/server/stat/AbstractStatistics.java similarity index 98% rename from src/javaeva/server/stat/AbstractStatistics.java rename to src/eva2/server/stat/AbstractStatistics.java index 7e969ad5..e40dd8b1 100644 --- a/src/javaeva/server/stat/AbstractStatistics.java +++ b/src/eva2/server/stat/AbstractStatistics.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; import java.io.FileOutputStream; import java.io.PrintWriter; @@ -7,11 +7,12 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javaeva.gui.BeanInspector; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.gui.BeanInspector; +import eva2.server.go.IndividualInterface; +import eva2.server.go.PopulationInterface; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; + import wsi.ra.tool.StatisticUtils; public abstract class AbstractStatistics implements InterfaceTextListener, InterfaceStatistics { diff --git a/src/javaeva/server/stat/GenericStatistics.java b/src/eva2/server/stat/GenericStatistics.java similarity index 97% rename from src/javaeva/server/stat/GenericStatistics.java rename to src/eva2/server/stat/GenericStatistics.java index 82c21235..2a850a85 100644 --- a/src/javaeva/server/stat/GenericStatistics.java +++ b/src/eva2/server/stat/GenericStatistics.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA * Description: @@ -14,9 +14,10 @@ package javaeva.server.stat; *==========================================================================*/ import java.io.Serializable; import java.lang.reflect.Field; -import javaeva.gui.DataViewer; -import javaeva.gui.DataViewerInterface; -import javaeva.gui.Graph; + +import eva2.gui.DataViewer; +import eva2.gui.DataViewerInterface; +import eva2.gui.Graph; import wsi.ra.jproxy.MainAdapterClient; /** diff --git a/src/javaeva/server/stat/InterfaceStatistics.java b/src/eva2/server/stat/InterfaceStatistics.java similarity index 87% rename from src/javaeva/server/stat/InterfaceStatistics.java rename to src/eva2/server/stat/InterfaceStatistics.java index 7260f654..f4ec1d68 100644 --- a/src/javaeva/server/stat/InterfaceStatistics.java +++ b/src/eva2/server/stat/InterfaceStatistics.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA * Description: @@ -12,10 +12,10 @@ package javaeva.server.stat; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.server.go.IndividualInterface; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.PopulationInterface; +import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; /*==========================================================================* * INTERFACE DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/stat/InterfaceStatisticsParameter.java b/src/eva2/server/stat/InterfaceStatisticsParameter.java similarity index 97% rename from src/javaeva/server/stat/InterfaceStatisticsParameter.java rename to src/eva2/server/stat/InterfaceStatisticsParameter.java index a59596fb..c04802b1 100644 --- a/src/javaeva/server/stat/InterfaceStatisticsParameter.java +++ b/src/eva2/server/stat/InterfaceStatisticsParameter.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA * Description: @@ -14,7 +14,8 @@ package javaeva.server.stat; *==========================================================================*/ import java.util.List; -import javaeva.tools.SelectedTag; +import eva2.tools.SelectedTag; + /*==========================================================================* * INTERFACE DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/stat/InterfaceTextListener.java b/src/eva2/server/stat/InterfaceTextListener.java similarity index 79% rename from src/javaeva/server/stat/InterfaceTextListener.java rename to src/eva2/server/stat/InterfaceTextListener.java index 8c1c298c..a717e5cd 100644 --- a/src/javaeva/server/stat/InterfaceTextListener.java +++ b/src/eva2/server/stat/InterfaceTextListener.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; public interface InterfaceTextListener { public void print(String str); diff --git a/src/javaeva/server/stat/MovingAverage.java b/src/eva2/server/stat/MovingAverage.java similarity index 98% rename from src/javaeva/server/stat/MovingAverage.java rename to src/eva2/server/stat/MovingAverage.java index 87a2374b..6554d454 100644 --- a/src/javaeva/server/stat/MovingAverage.java +++ b/src/eva2/server/stat/MovingAverage.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/server/stat/StatisticsStandalone.java b/src/eva2/server/stat/StatisticsStandalone.java similarity index 97% rename from src/javaeva/server/stat/StatisticsStandalone.java rename to src/eva2/server/stat/StatisticsStandalone.java index b33d49fc..93e46bc4 100644 --- a/src/javaeva/server/stat/StatisticsStandalone.java +++ b/src/eva2/server/stat/StatisticsStandalone.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA @@ -22,9 +22,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.PopulationInterface; +import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; + /* * ==========================================================================* diff --git a/src/javaeva/server/stat/StatisticsWithGUI.java b/src/eva2/server/stat/StatisticsWithGUI.java similarity index 96% rename from src/javaeva/server/stat/StatisticsWithGUI.java rename to src/eva2/server/stat/StatisticsWithGUI.java index dbee1b12..63566e64 100644 --- a/src/javaeva/server/stat/StatisticsWithGUI.java +++ b/src/eva2/server/stat/StatisticsWithGUI.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA @@ -18,15 +18,16 @@ import java.net.InetAddress; import java.util.ArrayList; import java.util.List; -import javaeva.gui.BeanInspector; -import javaeva.gui.Graph; -import javaeva.gui.GraphWindow; -import javaeva.gui.JTextoutputFrame; -import javaeva.gui.JTextoutputFrameInterface; -import javaeva.server.EvAServer; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.problems.InterfaceAdditionalPopulationInformer; -import javaeva.tools.EVAERROR; +import eva2.gui.BeanInspector; +import eva2.gui.Graph; +import eva2.gui.GraphWindow; +import eva2.gui.JTextoutputFrame; +import eva2.gui.JTextoutputFrameInterface; +import eva2.server.EvAServer; +import eva2.server.go.PopulationInterface; +import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.tools.EVAERROR; + import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.RMIProxyLocal; import wsi.ra.jproxy.RMIProxyRemote; diff --git a/src/javaeva/server/stat/StatsParameter.java b/src/eva2/server/stat/StatsParameter.java similarity index 98% rename from src/javaeva/server/stat/StatsParameter.java rename to src/eva2/server/stat/StatsParameter.java index 3b429fc6..0503bac7 100644 --- a/src/javaeva/server/stat/StatsParameter.java +++ b/src/eva2/server/stat/StatsParameter.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA @@ -16,10 +16,11 @@ package javaeva.server.stat; import java.io.Serializable; import java.util.ArrayList; -import javaeva.gui.GenericObjectEditor; -import javaeva.tools.Serializer; -import javaeva.tools.Tag; -import javaeva.tools.SelectedTag; +import eva2.gui.GenericObjectEditor; +import eva2.tools.SelectedTag; +import eva2.tools.Serializer; +import eva2.tools.Tag; + /*==========================================================================* * CLASS DECLARATION diff --git a/src/javaeva/tools/Cluster.java b/src/eva2/tools/Cluster.java similarity index 98% rename from src/javaeva/tools/Cluster.java rename to src/eva2/tools/Cluster.java index 74a0338b..ab4b0ed9 100644 --- a/src/javaeva/tools/Cluster.java +++ b/src/eva2/tools/Cluster.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA * Description: diff --git a/src/javaeva/tools/CubicSpline.java b/src/eva2/tools/CubicSpline.java similarity index 99% rename from src/javaeva/tools/CubicSpline.java rename to src/eva2/tools/CubicSpline.java index e65baec3..939a43e2 100644 --- a/src/javaeva/tools/CubicSpline.java +++ b/src/eva2/tools/CubicSpline.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /********************************************************** * diff --git a/src/javaeva/tools/EVAERROR.java b/src/eva2/tools/EVAERROR.java similarity index 71% rename from src/javaeva/tools/EVAERROR.java rename to src/eva2/tools/EVAERROR.java index e1fb40bc..0e3dcbbb 100644 --- a/src/javaeva/tools/EVAERROR.java +++ b/src/eva2/tools/EVAERROR.java @@ -1,4 +1,6 @@ -package javaeva.tools; +package eva2.tools; + +import java.util.HashMap; /** * Title: JavaEvA * Description: @@ -21,6 +23,7 @@ package javaeva.tools; public class EVAERROR { static boolean MAIL_ON_ERROR = false; static boolean MAIL_ON_WARNING = false; + transient static HashMap errMap = null; /** * */ @@ -56,4 +59,27 @@ public class EVAERROR { System.out.flush(); System.err.flush(); } + + /** + * Send a message only once to System.err. Once means that the msg is + * stored for the lifetime of the VM or until clearMsgCache() is called. + * + * @param msg + */ + static public void errorMsgOnce(String msg) { + if (errMap == null) errMap = new HashMap(); + + if (!errMap.containsKey(msg)) { + System.err.println(msg); + errMap.put(msg, new Boolean(true)); + } + } + + /** + * Clear the error message cache, so that any error messages are + * displayed at least once. + */ + static public void clearMsgCache() { + if (errMap != null) errMap.clear(); + } } diff --git a/src/javaeva/tools/EVAHELP.java b/src/eva2/tools/EVAHELP.java similarity index 98% rename from src/javaeva/tools/EVAHELP.java rename to src/eva2/tools/EVAHELP.java index 660fe94c..f50d4cac 100644 --- a/src/javaeva/tools/EVAHELP.java +++ b/src/eva2/tools/EVAHELP.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA * Description: @@ -21,7 +21,8 @@ import java.net.InetAddress; import java.util.Enumeration; import java.util.Properties; -import javaeva.client.EvAClient; +import eva2.client.EvAClient; + import wsi.ra.tool.BasicResourceLoader; diff --git a/src/javaeva/tools/EVAThread.java b/src/eva2/tools/EVAThread.java similarity index 99% rename from src/javaeva/tools/EVAThread.java rename to src/eva2/tools/EVAThread.java index da43ea79..8b8acb46 100644 --- a/src/javaeva/tools/EVAThread.java +++ b/src/eva2/tools/EVAThread.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA diff --git a/src/javaeva/tools/JPasswordDialog.java b/src/eva2/tools/JPasswordDialog.java similarity index 99% rename from src/javaeva/tools/JPasswordDialog.java rename to src/eva2/tools/JPasswordDialog.java index 90542a5b..a4713a09 100644 --- a/src/javaeva/tools/JPasswordDialog.java +++ b/src/eva2/tools/JPasswordDialog.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; import javax.swing.JDialog; import java.awt.HeadlessException; diff --git a/src/javaeva/tools/JarResources.java b/src/eva2/tools/JarResources.java similarity index 99% rename from src/javaeva/tools/JarResources.java rename to src/eva2/tools/JarResources.java index bfbf28f9..a0afe98a 100644 --- a/src/javaeva/tools/JarResources.java +++ b/src/eva2/tools/JarResources.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA * Description: diff --git a/src/javaeva/tools/KMEANSJAVA.java b/src/eva2/tools/KMEANSJAVA.java similarity index 99% rename from src/javaeva/tools/KMEANSJAVA.java rename to src/eva2/tools/KMEANSJAVA.java index ace87717..3df10ade 100644 --- a/src/javaeva/tools/KMEANSJAVA.java +++ b/src/eva2/tools/KMEANSJAVA.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA * Description: diff --git a/src/javaeva/tools/LogProxy.java b/src/eva2/tools/LogProxy.java similarity index 99% rename from src/javaeva/tools/LogProxy.java rename to src/eva2/tools/LogProxy.java index ac69fc99..52686a72 100644 --- a/src/javaeva/tools/LogProxy.java +++ b/src/eva2/tools/LogProxy.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; import java.io.Serializable; diff --git a/src/javaeva/tools/Mathematics.java b/src/eva2/tools/Mathematics.java similarity index 99% rename from src/javaeva/tools/Mathematics.java rename to src/eva2/tools/Mathematics.java index b0bcca05..513f9f98 100644 --- a/src/javaeva/tools/Mathematics.java +++ b/src/eva2/tools/Mathematics.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; import java.util.Arrays; import wsi.ra.math.interpolation.BasicDataSet; diff --git a/src/javaeva/tools/MultirunRefiner.java b/src/eva2/tools/MultirunRefiner.java similarity index 99% rename from src/javaeva/tools/MultirunRefiner.java rename to src/eva2/tools/MultirunRefiner.java index dc6e20f4..cadcdadb 100644 --- a/src/javaeva/tools/MultirunRefiner.java +++ b/src/eva2/tools/MultirunRefiner.java @@ -4,7 +4,7 @@ * Created on 8. Oktober 2002, 09:47 */ -package javaeva.tools; +package eva2.tools; import java.awt.*; import java.awt.event.*; diff --git a/src/javaeva/tools/Pair.java b/src/eva2/tools/Pair.java similarity index 94% rename from src/javaeva/tools/Pair.java rename to src/eva2/tools/Pair.java index 042747b9..2dd5aba4 100644 --- a/src/javaeva/tools/Pair.java +++ b/src/eva2/tools/Pair.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Simple pair structure of two types, Scheme style, but typed. diff --git a/src/javaeva/tools/ReflectPackage.java b/src/eva2/tools/ReflectPackage.java similarity index 98% rename from src/javaeva/tools/ReflectPackage.java rename to src/eva2/tools/ReflectPackage.java index cd59bfa4..139a68e3 100644 --- a/src/javaeva/tools/ReflectPackage.java +++ b/src/eva2/tools/ReflectPackage.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; import java.io.File; import java.io.FileInputStream; @@ -321,8 +321,8 @@ public class ReflectPackage { public static void main(String[] args) { ClassLoader cld = Thread.currentThread().getContextClassLoader(); - System.out.println("1: " + cld.getResource("/javaeva/server")); - System.out.println("2: " + cld.getResource("javaeva/server")); + System.out.println("1: " + cld.getResource("/eva2/server")); + System.out.println("2: " + cld.getResource("eva2/server")); // BasicResourceLoader rld = BasicResourceLoader.instance(); // byte[] b = rld.getBytesFromResourceLocation("resources/images/Sub24.gif"); // System.out.println((b == null) ? "null" : b.toString()); diff --git a/src/javaeva/tools/SelectedTag.java b/src/eva2/tools/SelectedTag.java similarity index 99% rename from src/javaeva/tools/SelectedTag.java rename to src/eva2/tools/SelectedTag.java index 9384c2cc..43cd1a75 100644 --- a/src/javaeva/tools/SelectedTag.java +++ b/src/eva2/tools/SelectedTag.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * This serves as activation state of one item in an array of Tags diff --git a/src/javaeva/tools/Serializer.java b/src/eva2/tools/Serializer.java similarity index 99% rename from src/javaeva/tools/Serializer.java rename to src/eva2/tools/Serializer.java index 16d37240..91298df9 100644 --- a/src/javaeva/tools/Serializer.java +++ b/src/eva2/tools/Serializer.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA * Description: diff --git a/src/javaeva/tools/ServerPingThread.java b/src/eva2/tools/ServerPingThread.java similarity index 93% rename from src/javaeva/tools/ServerPingThread.java rename to src/eva2/tools/ServerPingThread.java index 2637ee98..b88d376c 100644 --- a/src/javaeva/tools/ServerPingThread.java +++ b/src/eva2/tools/ServerPingThread.java @@ -1,11 +1,12 @@ -package javaeva.tools; +package eva2.tools; -import javaeva.server.EvAMainAdapter; import java.util.StringTokenizer; import wsi.ra.jproxy.RMIInvocationHandler; -import javaeva.server.EvAMainAdapterImpl; import java.rmi.Naming; +import eva2.server.EvAMainAdapter; +import eva2.server.EvAMainAdapterImpl; + /** *

Title: The JavaEvA

*

Description:

diff --git a/src/javaeva/tools/StringTools.java b/src/eva2/tools/StringTools.java similarity index 98% rename from src/javaeva/tools/StringTools.java rename to src/eva2/tools/StringTools.java index e9e09e11..0c50301c 100644 --- a/src/javaeva/tools/StringTools.java +++ b/src/eva2/tools/StringTools.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; import java.util.StringTokenizer; diff --git a/src/javaeva/tools/TXTFileFilter.java b/src/eva2/tools/TXTFileFilter.java similarity index 97% rename from src/javaeva/tools/TXTFileFilter.java rename to src/eva2/tools/TXTFileFilter.java index 34aad2fc..9292e7da 100644 --- a/src/javaeva/tools/TXTFileFilter.java +++ b/src/eva2/tools/TXTFileFilter.java @@ -4,7 +4,7 @@ * Created on 8. Oktober 2002, 14:20 */ -package javaeva.tools; +package eva2.tools; import javax.swing.filechooser.FileFilter; diff --git a/src/javaeva/tools/Tag.java b/src/eva2/tools/Tag.java similarity index 97% rename from src/javaeva/tools/Tag.java rename to src/eva2/tools/Tag.java index 72a5fbde..e5c323fb 100644 --- a/src/javaeva/tools/Tag.java +++ b/src/eva2/tools/Tag.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA * Description: diff --git a/src/javaeva/tools/TokenHolder.java b/src/eva2/tools/TokenHolder.java similarity index 99% rename from src/javaeva/tools/TokenHolder.java rename to src/eva2/tools/TokenHolder.java index 03394682..5e81c3a7 100644 --- a/src/javaeva/tools/TokenHolder.java +++ b/src/eva2/tools/TokenHolder.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA diff --git a/src/javaeva/tools/URLGetter.java b/src/eva2/tools/URLGetter.java similarity index 98% rename from src/javaeva/tools/URLGetter.java rename to src/eva2/tools/URLGetter.java index 0f191ad8..3d3a57ae 100644 --- a/src/javaeva/tools/URLGetter.java +++ b/src/eva2/tools/URLGetter.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; import java.net.*; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/wsi/ra/jproxy/ComAdapter.java b/src/wsi/ra/jproxy/ComAdapter.java index adaab4ba..31a60f67 100644 --- a/src/wsi/ra/jproxy/ComAdapter.java +++ b/src/wsi/ra/jproxy/ComAdapter.java @@ -21,7 +21,8 @@ import java.util.ArrayList; import java.util.Properties; import java.util.StringTokenizer; -import javaeva.tools.Serializer; +import eva2.tools.Serializer; + /** * diff --git a/src/wsi/ra/jproxy/MainAdapterImpl.java b/src/wsi/ra/jproxy/MainAdapterImpl.java index 815bf113..67a4e4b7 100644 --- a/src/wsi/ra/jproxy/MainAdapterImpl.java +++ b/src/wsi/ra/jproxy/MainAdapterImpl.java @@ -46,10 +46,9 @@ public class MainAdapterImpl implements MainAdapter { public void restartServer() { System.out.println("Received message to restartServer !!!!"); try { - String Out =""; - String command = "java -cp .:../lib/jdom.jar:../lib/log4j.jar javaeva.server.EvAServer &"; + String command = "java -cp . eva2.server.EvAServer &"; - System.out.println("Calling the command:"+"java javaeva.server.EvAServer"); + System.out.println("Calling the command:"+"java eva2.server.EvAServer"); Process pro = Runtime.getRuntime().exec(command); BufferedReader in = new BufferedReader ( new InputStreamReader (pro.getInputStream())); // String line = null;