New options in scripts.

src/core/de.evoal.core.main/scripts/run-search.sh

@@ -16,8 +16,23 @@ cd "$1" || exit 1
 POSITIONAL_ARGUMENTS=( "$@" )
 POSITIONAL_ARGUMENTS=("${POSITIONAL_ARGUMENTS[@]:3}")
 
+declare -a JVM_ARGUMENTS=()
+
+if [ ${EVOAL_VM+x} ]; then
+  JVM_ARGUMENTS+=( "${EVOAL_VM[@]}" )
+fi
+
+if [ ${EVOAL_DEBUG+x} ]; then
+  JVM_ARGUMENTS+=( "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=1044" )
+fi
+
+if [ ${EVOAL_LOGGING+x} ]; then
+  POSITIONAL_ARGUMENTS+=( "-Bcore:logging=$EVOAL_LOGGING" )
+fi
+
 set -x
-java ${CLASSPATH[@]} \
+java ${JVM_ARGUMENTS[@]} \
+     ${CLASSPATH[@]} \
      ${POSITIONAL_ARGUMENTS[@]} \
      -Bcore:main=heuristic-search \
      "-Bcore:optimisation-configuration-file=$2" \

src/core/de.evoal.surrogate.api/scripts/debug-search-with-surrogate.sh

-#!/bin/bash
-
-set -e -x
-
-if [ -z ${EVOAL_HOME+x} ]; then
-  EVOAL_HOME=$( cd -- "$(dirname $0)/../" >/dev/null 2>&1 ; pwd -P )
-fi
-
-source $EVOAL_HOME/bin/paths.env
-
-if [ "$#" -lt 7 ]; then
-    echo "Usage: $0 <execution-folder> <ol-file> <mll-file> <pre-trained.pson> <training-points.json> <output> <constraint-folder> [EvoAl parameters]"
-    exit 1
-fi
-
-cd "$1" || exit 1
-
-POSITIONAL_ARGUMENTS=( "$@" )
-POSITIONAL_ARGUMENTS=("${POSITIONAL_ARGUMENTS[@]:7}")
-
-java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=1044\
-     ${CLASSPATH[@]} \
-     ${POSITIONAL_ARGUMENTS[@]}\
-     -Bcore:main=heuristic-search \
-     "-Bcore:optimisation-configuration-file=$2" \
-     "-Bsurrogate:configuration-file=$3" \
-     "-Bsurrogate:pre-trained=$4" \
-     "-Bsurrogate:training-data=$5"\
-     "-Bcore:evaluation-output-folder=$6" \
-     "-Bcore:constraint-folder=$7"

src/core/de.evoal.surrogate.api/scripts/run-search-with-surrogate.sh

-#!/bin/bash
-
-set -e -x
+#!/bin/sh
 
 if [ -z ${EVOAL_HOME+x} ]; then
   EVOAL_HOME=$( cd -- "$(dirname $0)/../" >/dev/null 2>&1 ; pwd -P )
@@ -18,8 +16,24 @@ cd "$1" || exit 1
 POSITIONAL_ARGUMENTS=( "$@" )
 POSITIONAL_ARGUMENTS=("${POSITIONAL_ARGUMENTS[@]:7}")
 
+declare -a JVM_ARGUMENTS=()
+
+if [ ${EVOAL_VM+x} ]; then
+  JVM_ARGUMENTS+=( "${EVOAL_VM[@]}" )
+fi
+
+if [ ${EVOAL_DEBUG+x} ]; then
+  JVM_ARGUMENTS+=( "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=1044" )
+fi
+
+if [ ${EVOAL_LOGGING+x} ]; then
+  POSITIONAL_ARGUMENTS+=( "-Bcore:logging=$EVOAL_LOGGING" )
+fi
+
+
 set -x
-java ${CLASSPATH[@]} \
+java ${JVM_ARGUMENTS[@]} \
+     ${CLASSPATH[@]} \
      ${POSITIONAL_ARGUMENTS[@]} \
      -Bcore:main=heuristic-search \
      "-Bcore:optimisation-configuration-file=$2" \
@@ -27,4 +41,4 @@ java ${CLASSPATH[@]} \
      "-Bsurrogate:pre-trained=$4" \
      "-Bsurrogate:training-data=$5"\
      "-Bcore:evaluation-output-folder=$6" \
-     "-Bcore:constraint-folder=$7"
+     "-Bcore:constraint-folder=$7"
\ No newline at end of file