Merge branch 'master' of https://github.com/MOEAFramework/RealWorldBe…

…nchmarks into windows-build
MOEAFramework · Nov 30, 2023 · d4c23e1 · d4c23e1
2 parents a706653 + 94bef6a
commit d4c23e1
Show file tree

Hide file tree

Showing 32 changed files with 57 additions and 316 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -0,0 +1,21 @@
+name: Build Windows
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run Make
+        run: make -C native
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: native-windows
+          path: native/
diff --git a/global.properties → moeaframework.properties b/global.properties → moeaframework.properties
@@ -5,4 +5,4 @@ org.moeaframework.analysis.diagnostics.problems = GAA, HBV, \
 
 ## The Radar Waveform Design problem requires Matlab.  By default, the command
 ## 'matlab' is used, but a custom path can be specified below if required.
-#matlab.path = /usr/global/matlab/R2013a/bin/matlab
+#matlab.path = /usr/global/matlab/R2013a/bin/matlab
diff --git a/native/HBV/Makefile b/native/HBV/Makefile
@@ -29,8 +29,16 @@ SRC_DIR = src
 CC_SERIAL = g++
 
 #If profiling, add the -pg flag in the last line of these as well
-C_FLAGS = -O3 -DLINUX -DOUT_TO_SCREEN -DHBVMOD -DRANGER_MEMORY_TRICK -DSERIAL -lm
-C_FLAGS_DEBUG = -g -O0 -DLINUX -DOUT_TO_SCREEN -DHBVMOD -DRANGER_MEMORY_TRICK -DSERIAL -lm
+C_FLAGS = -O3 -DOUT_TO_SCREEN -DHBVMOD -DRANGER_MEMORY_TRICK -DSERIAL -lm
+C_FLAGS_DEBUG = -g -O0 -DOUT_TO_SCREEN -DHBVMOD -DRANGER_MEMORY_TRICK -DSERIAL -lm
+
+ifeq ($(OS),Windows_NT)
+    C_FLAGS += -static
+    C_FLAGS_DEBUG += -static
+else
+    C_FLAGS += -DLINUX
+    C_FLAGS_DEBUG += -DLINUX
+endif
 
 HBV_SOURCE = $(SRC_DIR)/HBVMain.cpp \
     $(SRC_DIR)/HBV.cpp \

diff --git a/native/HBV/bin/hbv.exe b/native/HBV/bin/hbv.exe
diff --git a/native/LRGV/Makefile b/native/LRGV/Makefile
@@ -2,7 +2,14 @@ CC=g++
 TARGET=lrgv
 SRC_DIR = src
 SHARED_DIR = ../shared
-C_FLAGS=-O3 -I$(SRC_DIR) -I$(SHARED_DIR) -DLINUX
+C_FLAGS=-O3 -I$(SRC_DIR) -I$(SHARED_DIR)
+
+ifeq ($(OS),Windows_NT)
+	C_FLAGS += -static
+else
+    C_FLAGS += -DLINUX
+endif
+
 SOURCE = $(SRC_DIR)/lrgv_main.cpp \
 	$(SHARED_DIR)/moeaframework.c \
 	$(SRC_DIR)/lrgv_functions.cpp \

diff --git a/native/LRGV/bin/lrgv.exe b/native/LRGV/bin/lrgv.exe
diff --git a/native/LakeProblem/Makefile b/native/LakeProblem/Makefile
@@ -2,9 +2,13 @@ CC = g++
 SRC_DIR = src
 SHARED_DIR = ../shared
 TARGET = lake
-C_FLAGS = -O3 -Wno-unused-local-typedefs -I$(SRC_DIR) -I$(SHARED_DIR) -I$(SRC_DIR)/boost_1_56_0 
+C_FLAGS = -O3 -Wno-unused-local-typedefs -I$(SRC_DIR) -I$(SHARED_DIR) -I$(SRC_DIR)/boost_1_56_0
 SOURCE = $(SRC_DIR)/main-lake.cpp $(SHARED_DIR)/moeaframework.c
 
+ifeq ($(OS),Windows_NT)
+	C_FLAGS += -static
+endif
+
 all:
 	mkdir -p bin
 	$(CC) $(C_FLAGS) -o bin/$(TARGET) $(SOURCE) 

diff --git a/native/LakeProblem/bin/lake.exe b/native/LakeProblem/bin/lake.exe
diff --git a/native/Radar/Makefile b/native/Radar/Makefile
@@ -2,8 +2,12 @@ CC = gcc
 SHARED_DIR = ../shared
 C_FLAGS = -Wall -O3 -fPIC
 
+ifeq ($(OS),Windows_NT)
+	EXT = dll
+else
+	EXT = so
+endif
+
 all:
-	$(CC) $(C_FLAGS) -o bin/moeaframework.o -c $(SHARED_DIR)/moeaframework.c
-	ld -G bin/moeaframework.o -o bin/libmoeaframework.so
-	rm bin/moeaframework.o
-
+	$(CC) $(C_FLAGS) -shared -o bin/moeaframework.$(EXT) -c $(SHARED_DIR)/moeaframework.c
+
diff --git a/native/Radar/bin/moeaframework.dll b/native/Radar/bin/moeaframework.dll
diff --git a/native/WDS/Makefile b/native/WDS/Makefile
@@ -4,6 +4,10 @@ SHARED_DIR = ../shared
 SOURCE = $(SRC_DIR)/main.c $(SRC_DIR)/models.c $(SHARED_DIR)/moeaframework.c
 C_FLAGS = -I$(SRC_DIR)/epanet2 -I$(SHARED_DIR) -Lbin -lm -lepanet2 -Wl,-R,\.
 
+ifeq ($(OS),Windows_NT)
+	C_FLAGS += -static
+endif
+
 all:
 	$(MAKE) -C $(SRC_DIR)/epanet2
 	$(CC) -o bin/TRN -DTRN $(SOURCE) $(C_FLAGS)

diff --git a/native/WDS/bin/BAK.exe b/native/WDS/bin/BAK.exe
diff --git a/native/WDS/bin/BIN.exe b/native/WDS/bin/BIN.exe
diff --git a/native/WDS/bin/BLA.exe b/native/WDS/bin/BLA.exe
diff --git a/native/WDS/bin/EXN.exe b/native/WDS/bin/EXN.exe
diff --git a/native/WDS/bin/FOS.exe b/native/WDS/bin/FOS.exe
diff --git a/native/WDS/bin/GOY.exe b/native/WDS/bin/GOY.exe
diff --git a/native/WDS/bin/HAN.exe b/native/WDS/bin/HAN.exe
diff --git a/native/WDS/bin/MOD.exe b/native/WDS/bin/MOD.exe
diff --git a/native/WDS/bin/NYT.exe b/native/WDS/bin/NYT.exe
diff --git a/native/WDS/bin/PES.exe b/native/WDS/bin/PES.exe
diff --git a/native/WDS/bin/TLN.exe b/native/WDS/bin/TLN.exe
diff --git a/native/WDS/bin/TRN.exe b/native/WDS/bin/TRN.exe
diff --git a/native/WDS/bin/epanet2.lib b/native/WDS/bin/epanet2.lib
diff --git a/src/main/java/org/moeaframework/benchmarks/CarSideImpact.java b/src/main/java/org/moeaframework/benchmarks/CarSideImpact.java
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream:src/main/java/org/moeaframework/benchmarks/CarSideImpact/CarSideImpact.java
 /* Copyright 2009-2023 David Hadka and other contributors
  *
  * This file is part of the MOEA Framework.
@@ -16,10 +15,7 @@
  * 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.CarSideImpact;
-=======
 package org.moeaframework.benchmarks;
->>>>>>> Stashed changes:src/main/java/org/moeaframework/benchmarks/CarSideImpact.java
 
 import org.moeaframework.core.Solution;
 import org.moeaframework.core.variable.EncodingUtils;

diff --git a/src/main/java/org/moeaframework/benchmarks/ElectricMotor.java b/src/main/java/org/moeaframework/benchmarks/ElectricMotor.java
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream:src/main/java/org/moeaframework/benchmarks/ElectricMotor/ElectricMotor.java
 /* Copyright 2009-2023 David Hadka and other contributors
  *
  * This file is part of the MOEA Framework.
@@ -16,10 +15,7 @@
  * 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.ElectricMotor;
-=======
 package org.moeaframework.benchmarks;
->>>>>>> Stashed changes:src/main/java/org/moeaframework/benchmarks/ElectricMotor.java
 
 import org.moeaframework.core.Solution;
 import org.moeaframework.core.variable.EncodingUtils;

diff --git a/src/main/java/org/moeaframework/benchmarks/GenerateReferenceSet.java b/src/main/java/org/moeaframework/benchmarks/GenerateReferenceSet.java
diff --git a/src/main/java/org/moeaframework/benchmarks/LRGV.java b/src/main/java/org/moeaframework/benchmarks/LRGV.java
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream:src/main/java/org/moeaframework/benchmarks/LRGV/LRGV.java
 /* Copyright 2009-2023 David Hadka and other contributors
  *
  * This file is part of the MOEA Framework.
@@ -16,10 +15,7 @@
  * 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.LRGV;
-=======
 package org.moeaframework.benchmarks;
->>>>>>> Stashed changes:src/main/java/org/moeaframework/benchmarks/LRGV.java
 
 import java.io.File;
 

diff --git a/src/main/java/org/moeaframework/benchmarks/LakeProblem.java b/src/main/java/org/moeaframework/benchmarks/LakeProblem.java
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream:src/main/java/org/moeaframework/benchmarks/LakeProblem/LakeProblem.java
 /* Copyright 2009-2023 David Hadka and other contributors
  *
  * This file is part of the MOEA Framework.
@@ -16,10 +15,7 @@
  * 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.LakeProblem;
-=======
 package org.moeaframework.benchmarks;
->>>>>>> Stashed changes:src/main/java/org/moeaframework/benchmarks/LakeProblem.java
 
 import java.io.File;
 

diff --git a/src/main/java/org/moeaframework/benchmarks/WDS/WDS.java b/src/main/java/org/moeaframework/benchmarks/WDS/WDS.java
diff --git a/src/main/java/org/moeaframework/benchmarks/WDS/WDSConverter.java b/src/main/java/org/moeaframework/benchmarks/WDS/WDSConverter.java