From 8e98b9ea83546e4611885640f69a21e67e566261 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Tue, 30 Apr 2019 16:22:13 +0200
Subject: [PATCH] Add JavaUtils class to imports in JRAG files.
---
eraser-base/src/main/jastadd/Imports.jadd | 1 +
eraser-base/src/main/jastadd/MachineLearning.jrag | 6 +++---
eraser-base/src/main/jastadd/NeuralNetwork.jrag | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/eraser-base/src/main/jastadd/Imports.jadd b/eraser-base/src/main/jastadd/Imports.jadd
index 1c1a2e64..62c74671 100644
--- a/eraser-base/src/main/jastadd/Imports.jadd
+++ b/eraser-base/src/main/jastadd/Imports.jadd
@@ -1,5 +1,6 @@
import java.util.*;
import de.tudresden.inf.st.eraser.util.MemberPrinter;
+import de.tudresden.inf.st.eraser.util.JavaUtils;
aspect Imports {
diff --git a/eraser-base/src/main/jastadd/MachineLearning.jrag b/eraser-base/src/main/jastadd/MachineLearning.jrag
index f9c93d35..339cbda9 100644
--- a/eraser-base/src/main/jastadd/MachineLearning.jrag
+++ b/eraser-base/src/main/jastadd/MachineLearning.jrag
@@ -14,7 +14,7 @@ aspect MachineLearning {
syn Leaf MachineLearningModel.classify();
//--- currentActivityName ---
- syn String Root.currentActivityName() = de.tudresden.inf.st.eraser.util.JavaUtils.ifPresentOrElseReturn(
+ syn String Root.currentActivityName() = JavaUtils.ifPresentOrElseReturn(
currentActivity(),
Activity::getLabel,
() -> "no activity"
@@ -64,7 +64,7 @@ aspect MachineLearning {
public void DummyMachineLearningModel.connectItems(List<String> itemNames) {
logger.info("Storing items to connect");
for (String itemName : itemNames) {
- de.tudresden.inf.st.eraser.util.JavaUtils.ifPresentOrElse(getRoot().resolveItem(itemName),
+ JavaUtils.ifPresentOrElse(getRoot().resolveItem(itemName),
this::addItem,
() -> logger.warn("Could not resolve item '{}'", itemName));
}
@@ -107,7 +107,7 @@ aspect MachineLearning {
//--- ActivityItem ---
@Override
public double ActivityItem.getState() {
- return de.tudresden.inf.st.eraser.util.JavaUtils.ifPresentOrElseReturn(
+ return JavaUtils.ifPresentOrElseReturn(
getRoot().currentActivity(),
activity -> (double) activity.getIdentifier(),
() -> super.getState()
diff --git a/eraser-base/src/main/jastadd/NeuralNetwork.jrag b/eraser-base/src/main/jastadd/NeuralNetwork.jrag
index f19ca710..d2953b92 100644
--- a/eraser-base/src/main/jastadd/NeuralNetwork.jrag
+++ b/eraser-base/src/main/jastadd/NeuralNetwork.jrag
@@ -100,7 +100,7 @@ aspect NeuralNetwork {
}
String itemName = itemNames.get(i);
InputNeuron neuron = getInputNeuron(i);
- de.tudresden.inf.st.eraser.util.JavaUtils.ifPresentOrElse(getRoot().resolveItem(itemName),
+ JavaUtils.ifPresentOrElse(getRoot().resolveItem(itemName),
neuron::setItem,
() -> logger.warn("Could not resolve item '{}'", itemName));
}
--
GitLab