From 99e8aae47f423cb31f62b813b403e3ec17a53960 Mon Sep 17 00:00:00 2001
From: "Bernhard J. Berger" <bernhard.berger@uni-bremen.de>
Date: Fri, 12 May 2023 08:26:48 +0200
Subject: [PATCH] Moved definition file for surrogate.simple
---
.../src/main/resources/META-INF/beans.xml | 6 +++++
.../META-INF/definitions/surrogate/simple.dl | 15 ------------
.../resources/de/evoal/surrogate/simple/ml.dl | 23 +++++++++++++++++++
3 files changed, 29 insertions(+), 15 deletions(-)
create mode 100644 src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/beans.xml
delete mode 100644 src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/definitions/surrogate/simple.dl
create mode 100644 src/core/de.evoal.surrogate.simple/src/main/resources/de/evoal/surrogate/simple/ml.dl
diff --git a/src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/beans.xml b/src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/beans.xml
new file mode 100644
index 00000000..848dca3b
--- /dev/null
+++ b/src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,6 @@
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+ bean-discovery-mode="annotated"
+ version="2.0">
+</beans>
\ No newline at end of file
diff --git a/src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/definitions/surrogate/simple.dl b/src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/definitions/surrogate/simple.dl
deleted file mode 100644
index 09542705..00000000
--- a/src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/definitions/surrogate/simple.dl
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * An exemplary identity function.
- */
-type identity extends surrogate {
-}
-
-type 'linear-regression' extends surrogate {
- intercept : float;
- slope : float;
-}
-
-type 'simple-quadratic-regression' extends surrogate {
- intercept : float;
- slope : float;
-}
\ No newline at end of file
diff --git a/src/core/de.evoal.surrogate.simple/src/main/resources/de/evoal/surrogate/simple/ml.dl b/src/core/de.evoal.surrogate.simple/src/main/resources/de/evoal/surrogate/simple/ml.dl
new file mode 100644
index 00000000..08d465ab
--- /dev/null
+++ b/src/core/de.evoal.surrogate.simple/src/main/resources/de/evoal/surrogate/simple/ml.dl
@@ -0,0 +1,23 @@
+import "definitions" from de.evoal.surrogate.ml;
+
+/**
+ * Simple surrogate functions.
+ */
+module de.evoal.surrogate.simple.ml {
+
+ /**
+ * An exemplary identity function.
+ */
+ type identity extends surrogate {
+ }
+
+ type 'linear-regression' extends surrogate {
+ intercept : float;
+ slope : float;
+ }
+
+ type 'simple-quadratic-regression' extends surrogate {
+ intercept : float;
+ slope : float;
+ }
+}
\ No newline at end of file
--
GitLab