Skip to content

Commit

Permalink
Update for MOEAFramework 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dhadka committed Apr 6, 2024
1 parent 952bf0e commit c3e9de3
Show file tree
Hide file tree
Showing 16 changed files with 91 additions and 27 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.settings/
target/
bin/
dependency-reduced-pom.xml

*.so
Expand Down
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2009-2023 David Hadka and other contributors. All rights reserved.
Copyright 2009-2024 David Hadka and other contributors. All rights reserved.

The MOEA Framework is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ separately.
<dependency>
<groupId>org.moeaframework</groupId>
<artifactId>real-world-benchmarks</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</dependency>
```

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.moeaframework</groupId>
<artifactId>real-world-benchmarks</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
<packaging>jar</packaging>

<name>Real World Benchmarks</name>
Expand Down Expand Up @@ -31,15 +31,15 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>org.moeaframework</groupId>
<artifactId>moeaframework</artifactId>
<version>3.8</version>
<version>4.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2009-2023 David Hadka and other contributors
/* Copyright 2009-2024 David Hadka and other contributors
*
* This file is part of the MOEA Framework.
*
Expand Down
12 changes: 5 additions & 7 deletions src/main/java/org/moeaframework/benchmarks/CarSideImpact.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2009-2023 David Hadka and other contributors
/* Copyright 2009-2024 David Hadka and other contributors
*
* This file is part of the MOEA Framework.
*
Expand All @@ -23,15 +23,13 @@
import org.moeaframework.problem.AbstractProblem;

/**
* The car side impact problem. Aims to minimize the weight of the car while
* minimizing the pubic force experienced by a passenger and the average
* velocity of the V-Pillar responsible for withstanding the impact load.
* The car side impact problem. Aims to minimize the weight of the car while minimizing the pubic force experienced by
* a passenger and the average velocity of the V-Pillar responsible for withstanding the impact load.
* <p>
* References:
* <ol>
* <li>Jain, H. and K. Deb. "An Evolutionary Many-Objective Optimization
* Algorithm Using Reference-Point-Based Nondominated Sorting Approach,
* Part II: Handling Constraints and Extending to an Adaptive Approach."
* <li>Jain, H. and K. Deb. "An Evolutionary Many-Objective Optimization Algorithm Using Reference-Point-Based
* Nondominated Sorting Approach, Part II: Handling Constraints and Extending to an Adaptive Approach."
* IEEE Transactions on Evolutionary Computation, 18(4):602-622, 2014.
* </ol>
*/
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/moeaframework/benchmarks/ElectricMotor.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2009-2023 David Hadka and other contributors
/* Copyright 2009-2024 David Hadka and other contributors
*
* This file is part of the MOEA Framework.
*
Expand Down Expand Up @@ -27,8 +27,8 @@
* <p>
* References:
* <ol>
* <li>Simpson, T.W., J.R.A. Maier, and F. Mistree (2001). "Product platform
* design: method and application." Res Eng Design, 13:2-22.
* <li>Simpson, T.W., J.R.A. Maier, and F. Mistree (2001). "Product platform design: method and application."
* Res Eng Design, 13:2-22.
* </ol>
*/
public class ElectricMotor extends AbstractProblem {
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/moeaframework/benchmarks/GAA.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/* Copyright 2004, 2010-2012 Timothy W. Simpson and others. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * * ---------------------------------------------------------------------- * * General Aviation Aircraft Problem using Response Surface Model * * This software was developed at the Pennsylvania State University by * Dr. Timothy Simpson, Dr. Patrick Reed, Brayan D'Souza, Ruchit Shah, * Matthew Woodruff, and David Hadka. If this software is used in * academic publications, please cite the following papers accordingly: * * [1] T. W. Simpson, W. Chen, J. K. Allen, and F. Mistree (1996), * "Conceptual design of a family of products through the use of * the robust concept exploration method," in 6th AIAA/USAF/NASA/ * ISSMO Symposium on Multidiciplinary Analysis and Optimization, * vol. 2, pp. 1535-1545. * * [2] T. W. Simpson, B. S. D'Souza (2004), "Assessing variable levels * of platform commonality within a product family using a * multiobjective genetic algorithm," Concurrent Engineering: * Research and Applications, vol. 12, no. 2, pp. 119-130. * * [3] R. Shah, P. M. Reed, and T. W. Simpson (2011), "Many-objective * evolutionary optimization and visual analytics for product * family design," Multiobjective Evolutionary Optimisation for * Product Design and Manufacturing, Springer, London, pp. 137-159. * * [4] D. Hadka, P. M. Reed, and T. W. Simpson (2012), "Diagnostic * Assessment of the Borg MOEA on Many-Objective Product Family * Design Problems," WCCI 2012 World Congress on Computational * Intelligence, Congress on Evolutionary Computation, Brisbane, * Australia, pp. 986-995. */package org.moeaframework.benchmarks;
import static java.lang.Math.pow;import org.moeaframework.core.Solution;import org.moeaframework.core.variable.EncodingUtils;import org.moeaframework.core.variable.RealVariable;import org.moeaframework.problem.AbstractProblem;
/**
* The General Aviation Aircraft (GAA) problem designed for use with the
* MOEA Framework.
* The General Aviation Aircraft (GAA) problem designed for use with the MOEA Framework.
*/
public class GAA extends AbstractProblem { public static final double[] EPSILON = new double[] { 0.15, 30.0, 6.0, 0.03, 30.0, 3000.0, 150.0, 0.3, 3.0, 0.3 };

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/moeaframework/benchmarks/LRGV.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2009-2023 David Hadka and other contributors
/* Copyright 2009-2024 David Hadka and other contributors
*
* This file is part of the MOEA Framework.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2009-2023 David Hadka and other contributors
/* Copyright 2009-2024 David Hadka and other contributors
*
* This file is part of the MOEA Framework.
*
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/org/moeaframework/benchmarks/Radar.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/* Copyright 2009-2024 David Hadka and other contributors
*
* This file is part of the MOEA Framework.
*
* The MOEA Framework is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* The MOEA Framework is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the MOEA Framework. If not, see <http://www.gnu.org/licenses/>.
*/
package org.moeaframework.benchmarks;

import java.io.File;
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/org/moeaframework/benchmarks/WDS.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/* Copyright 2009-2024 David Hadka and other contributors
*
* This file is part of the MOEA Framework.
*
* The MOEA Framework is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* The MOEA Framework is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the MOEA Framework. If not, see <http://www.gnu.org/licenses/>.
*/
package org.moeaframework.benchmarks;

import java.io.File;
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/org/moeaframework/problem/NativeCommand.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/* Copyright 2009-2024 David Hadka and other contributors
*
* This file is part of the MOEA Framework.
*
* The MOEA Framework is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* The MOEA Framework is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the MOEA Framework. If not, see <http://www.gnu.org/licenses/>.
*/
package org.moeaframework.problem;

import java.io.File;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/moeaframework/problem/NativeProblem.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2009-2023 David Hadka and other contributors
/* Copyright 2009-2024 David Hadka and other contributors
*
* This file is part of the MOEA Framework.
*
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/org/moeaframework/problem/OsType.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/* Copyright 2009-2024 David Hadka and other contributors
*
* This file is part of the MOEA Framework.
*
* The MOEA Framework is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* The MOEA Framework is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the MOEA Framework. If not, see <http://www.gnu.org/licenses/>.
*/
package org.moeaframework.problem;

import org.apache.commons.lang3.SystemUtils;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2009-2023 David Hadka and other contributors
/* Copyright 2009-2024 David Hadka and other contributors
*
* This file is part of the MOEA Framework.
*
Expand Down Expand Up @@ -27,8 +27,7 @@
import org.moeaframework.problem.NativeCommand;

/**
* Tests to ensure each benchmark problem can be instantiated with the MOEA
* Framework and reference sets exist.
* Tests to ensure each benchmark problem can be instantiated with the MOEA Framework and reference sets exist.
*/
public class BenchmarkProviderTest {

Expand All @@ -40,8 +39,7 @@ protected void test(String problemName, boolean hasReferenceSet) {
.run();

if (hasReferenceSet) {
Assert.assertNotNull("Missing reference set",
ProblemFactory.getInstance().getReferenceSet(problemName));
Assert.assertNotNull("Missing reference set", ProblemFactory.getInstance().getReferenceSet(problemName));
}
}

Expand Down

0 comments on commit c3e9de3

Please sign in to comment.