From c2b6833db892bdbb2fed4e3b36f960d58c62dd17 Mon Sep 17 00:00:00 2001
From: "Bernhard J. Berger" <bernhard.berger@uni-bremen.de>
Date: Fri, 10 Feb 2023 22:49:28 +0100
Subject: [PATCH] The code failed to restore a hyperbolic tangent SVR and
create a laplacian kernel instead. Fixed this bug.
---
.../META-INF/definitions/ea/density.dl | 22 -------------------
.../META-INF/definitions/surrogate/density.dl | 13 -----------
.../de/evoal/surrogate/svr/KernelHelper.java | 2 +-
3 files changed, 1 insertion(+), 36 deletions(-)
delete mode 100644 src/core/de.evoal.approximative.density/src/main/resources/META-INF/definitions/ea/density.dl
delete mode 100644 src/core/de.evoal.approximative.density/src/main/resources/META-INF/definitions/surrogate/density.dl
diff --git a/src/core/de.evoal.approximative.density/src/main/resources/META-INF/definitions/ea/density.dl b/src/core/de.evoal.approximative.density/src/main/resources/META-INF/definitions/ea/density.dl
deleted file mode 100644
index 2394a59f..00000000
--- a/src/core/de.evoal.approximative.density/src/main/resources/META-INF/definitions/ea/density.dl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Base type for density-based fitness value handling.
- */
-abstract type density extends 'decorated-fitness-function' {
- /**
- * Which probability calculation should be used (source-based, target-based, both).
- */
- kind : string;
-
- /**
- * Exponent for the formula.
- */
- exponent : float;
-
- /**
- * Exponent for the formula.
- */
- 'root-exponent' : float;
-}
-
-type density1 extends density {}
-type density2 extends density {}
\ No newline at end of file
diff --git a/src/core/de.evoal.approximative.density/src/main/resources/META-INF/definitions/surrogate/density.dl b/src/core/de.evoal.approximative.density/src/main/resources/META-INF/definitions/surrogate/density.dl
deleted file mode 100644
index e2819d3c..00000000
--- a/src/core/de.evoal.approximative.density/src/main/resources/META-INF/definitions/surrogate/density.dl
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Measures density information using kernel density.
- *
- * @param bandwith Width for density calculation.
- */
-def void 'density-estimation-1'(float bandwidth);
-
-/**
- * Measures density information using a gaussian kernel.
- *
- * @param bandwith Width for density calculation.
- */
-def void 'density-estimation-2'(float bandwidth);
\ No newline at end of file
diff --git a/src/core/de.evoal.surrogate.svr/src/main/java/de/evoal/surrogate/svr/KernelHelper.java b/src/core/de.evoal.surrogate.svr/src/main/java/de/evoal/surrogate/svr/KernelHelper.java
index e4ab6f23..46c4ce1c 100644
--- a/src/core/de.evoal.surrogate.svr/src/main/java/de/evoal/surrogate/svr/KernelHelper.java
+++ b/src/core/de.evoal.surrogate.svr/src/main/java/de/evoal/surrogate/svr/KernelHelper.java
@@ -153,7 +153,7 @@ public final class KernelHelper {
}
case "hyperbolic-tangent": {
- toHyperbolicTangentKernel(parameters);
+ return toHyperbolicTangentKernel(parameters);
}
case "laplacian": {
--
GitLab