diff --git a/eraser-base/src/main/jastadd/Imports.jadd b/eraser-base/src/main/jastadd/Imports.jadd index 1c1a2e648f78bb681a54f23efa80e5febb59f013..62c746716028bef2ec86cdac52a91f14f4a6d391 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 f9c93d35bb011c113e6ce6847ab8395068bc5fce..339cbda94f53d5ea5808af34dfdb3ba79924193e 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 f19ca7106612279f7ee685d6ad38ef2e00014bc4..d2953b92ad8ca32de17d7f1240b85d6a170c5687 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)); }