Skip to content
Snippets Groups Projects
Commit ff9a246e authored by René Schöne's avatar René Schöne
Browse files

Proper naming.

parent aa9bb283
No related branches found
No related tags found
1 merge request!5Proper naming.
Pipeline #4206 passed
Stage: build
Stage: test
Stage: report
Show whitespace changes
Inline Side-by-side
Showing
with 43 additions and 43 deletions
eraser-base/src/test/java/de/tudresden/inf/st/eraser/RulesTest.java
+ 15
− 15
View file @ ff9a246e
......@@ -137,7 +137,7 @@ public class RulesTest {
TestUtils.ModelAndItem modelAndItem = createModelAndItem(4);
Root root = modelAndItem.model.getRoot();
NumberItem item1 = modelAndItem.item;
NumberItem item2 = TestUtils.addItemTo(root.getOpenHAB2Model(), 4, useUpdatingItem);
NumberItem item2 = TestUtils.addItemTo(root.getSmartHomeEntityModel(), 4, useUpdatingItem);
Rule rule = new Rule();
CountingAction counter = new CountingAction();
......@@ -280,7 +280,7 @@ public class RulesTest {
TestUtils.ModelAndItem modelAndItem = createModelAndItem(2);
Root root = modelAndItem.model.getRoot();
NumberItem item = modelAndItem.item;
NumberItem item2 = TestUtils.addItemTo(root.getOpenHAB2Model(), 4, useUpdatingItem);
NumberItem item2 = TestUtils.addItemTo(root.getSmartHomeEntityModel(), 4, useUpdatingItem);
Rule ruleA = new Rule();
CountingAction counter1 = new CountingAction();
......@@ -323,7 +323,7 @@ public class RulesTest {
TestUtils.ModelAndItem modelAndItem = createModelAndItem(3);
Root root = modelAndItem.model.getRoot();
NumberItem item = modelAndItem.item;
NumberItem item2 = TestUtils.addItemTo(root.getOpenHAB2Model(), 4, useUpdatingItem);
NumberItem item2 = TestUtils.addItemTo(root.getSmartHomeEntityModel(), 4, useUpdatingItem);
Rule rule = new Rule();
rule.addAction(new SetStateFromConstantStringAction(item2, "5"));
......@@ -355,7 +355,7 @@ public class RulesTest {
TestUtils.ModelAndItem modelAndItem = createModelAndItem(0);
Root root = modelAndItem.model.getRoot();
NumberItem item = modelAndItem.item;
NumberItem item2 = TestUtils.addItemTo(root.getOpenHAB2Model(), 3, useUpdatingItem);
NumberItem item2 = TestUtils.addItemTo(root.getSmartHomeEntityModel(), 3, useUpdatingItem);
Rule rule = new Rule();
rule.addAction(new SetStateFromLambdaAction(item2, provider));
......@@ -397,7 +397,7 @@ public class RulesTest {
TestUtils.ModelAndItem modelAndItem = createModelAndItem(3);
Root root = modelAndItem.model.getRoot();
NumberItem item = modelAndItem.item;
StringItem item2 = addStringItem(root.getOpenHAB2Model(), "0");
StringItem item2 = addStringItem(root.getSmartHomeEntityModel(), "0");
Rule rule = new Rule();
CountingAction counter = new CountingAction();
......@@ -427,8 +427,8 @@ public class RulesTest {
TestUtils.ModelAndItem modelAndItem = createModelAndItem(3);
Root root = modelAndItem.model.getRoot();
NumberItem item = modelAndItem.item;
NumberItem item2 = TestUtils.addItemTo(root.getOpenHAB2Model(), 4, useUpdatingItem);
StringItem affectedItem = addStringItem(root.getOpenHAB2Model(), "1");
NumberItem item2 = TestUtils.addItemTo(root.getSmartHomeEntityModel(), 4, useUpdatingItem);
StringItem affectedItem = addStringItem(root.getSmartHomeEntityModel(), "1");
Rule rule = new Rule();
SetStateFromItemsAction action = new SetStateFromItemsAction(items ->
......@@ -473,7 +473,7 @@ public class RulesTest {
"12", affectedItem.getState());
// add new item to sum
NumberItem item3 = TestUtils.addItemTo(root.getOpenHAB2Model(), -4, useUpdatingItem);
NumberItem item3 = TestUtils.addItemTo(root.getSmartHomeEntityModel(), -4, useUpdatingItem);
action.addSourceItem(item3);
// still 7 + 5 = 12, as rule should not trigger
......@@ -494,7 +494,7 @@ public class RulesTest {
TestUtils.ModelAndItem modelAndItem = createModelAndItem(3);
Root root = modelAndItem.model.getRoot();
NumberItem item = modelAndItem.item;
NumberItem affectedItem = TestUtils.addItemTo(root.getOpenHAB2Model(), 4, useUpdatingItem);
NumberItem affectedItem = TestUtils.addItemTo(root.getSmartHomeEntityModel(), 4, useUpdatingItem);
Rule rule = new Rule();
rule.addAction(new AddDoubleToStateAction(affectedItem, 2));
......@@ -531,7 +531,7 @@ public class RulesTest {
TestUtils.ModelAndItem modelAndItem = createModelAndItem(3);
Root root = modelAndItem.model.getRoot();
NumberItem item = modelAndItem.item;
NumberItem affectedItem = TestUtils.addItemTo(root.getOpenHAB2Model(), 4, useUpdatingItem);
NumberItem affectedItem = TestUtils.addItemTo(root.getSmartHomeEntityModel(), 4, useUpdatingItem);
Rule rule = new Rule();
rule.addAction(new MultiplyDoubleToStateAction(affectedItem, 2));
......@@ -568,8 +568,8 @@ public class RulesTest {
TestUtils.ModelAndItem modelAndItem = createModelAndItem(3);
Root root = modelAndItem.model.getRoot();
NumberItem item1 = modelAndItem.item;
NumberItem item2 = TestUtils.addItemTo(root.getOpenHAB2Model(), 4, useUpdatingItem);
NumberItem affectedItem = TestUtils.addItemTo(root.getOpenHAB2Model(), 5, useUpdatingItem);
NumberItem item2 = TestUtils.addItemTo(root.getSmartHomeEntityModel(), 4, useUpdatingItem);
NumberItem affectedItem = TestUtils.addItemTo(root.getSmartHomeEntityModel(), 5, useUpdatingItem);
Rule ruleA = new Rule();
ruleA.addAction(new AddDoubleToStateAction(affectedItem, 2));
......@@ -623,8 +623,8 @@ public class RulesTest {
TestUtils.ModelAndItem modelAndItem = createModelAndItem(3);
Root root = modelAndItem.model.getRoot();
NumberItem item1 = modelAndItem.item;
NumberItem item2 = TestUtils.addItemTo(root.getOpenHAB2Model(), 4, useUpdatingItem);
NumberItem affectedItem = TestUtils.addItemTo(root.getOpenHAB2Model(), 5, useUpdatingItem);
NumberItem item2 = TestUtils.addItemTo(root.getSmartHomeEntityModel(), 4, useUpdatingItem);
NumberItem affectedItem = TestUtils.addItemTo(root.getSmartHomeEntityModel(), 5, useUpdatingItem);
Rule rule = new Rule();
SetStateFromExpression action = new SetStateFromExpression();
......@@ -710,7 +710,7 @@ public class RulesTest {
return message + " (Using " + name + ")";
}
private StringItem addStringItem(OpenHAB2Model model, String initialValue) {
private StringItem addStringItem(SmartHomeEntityModel model, String initialValue) {
StringItem item = new StringItem();
Group group = TestUtils.getDefaultGroup(model);
item.setID("item" + group.getNumItem());
......
eraser-base/src/test/java/de/tudresden/inf/st/eraser/jastadd_test/core/TestRunner.java
+ 1
− 1
View file @ ff9a246e
......@@ -30,7 +30,7 @@
package de.tudresden.inf.st.eraser.jastadd_test.core;
import beaver.Parser;
import de.tudresden.inf.st.eraser.jastadd.model.OpenHAB2Model;
import de.tudresden.inf.st.eraser.jastadd.model.SmartHomeEntityModel;
import de.tudresden.inf.st.eraser.jastadd.model.Root;
import de.tudresden.inf.st.eraser.util.ParserUtils;
......
eraser.spark/src/main/java/de/tudresden/inf/st/eraser/spark/Application.java
+ 5
− 5
View file @ ff9a246e
......@@ -106,15 +106,15 @@ public class Application {
//--- GET /model/items ---
Spark.get("",
(request, response) -> wrapItemList(root.getOpenHAB2Model().items()),
(request, response) -> wrapItemList(root.getSmartHomeEntityModel().items()),
mapper::writeValueAsString);
Spark.path("/:identifier", () -> {
Spark.put("", (request, response) -> {
OpenHAB2Model openHAB2Model = root.getOpenHAB2Model();
SmartHomeEntityModel SmartHomeEntityModel = root.getSmartHomeEntityModel();
Item item = ParserUtils.parseItem(request.body());
if (!openHAB2Model.resolveItem(item.getID()).isPresent()) {
root.getOpenHAB2Model().addNewItem(item);
if (!SmartHomeEntityModel.resolveItem(item.getID()).isPresent()) {
root.getSmartHomeEntityModel().addNewItem(item);
response.status(201);
return "OK";
} else {
......@@ -165,7 +165,7 @@ public class Application {
}
private Object safeItemRoute(Request request, Response response, Function<Item, String> action) {
return JavaUtils.ifPresentOrElseReturn(root.getOpenHAB2Model().resolveItem(request.params("identifier")), action,
return JavaUtils.ifPresentOrElseReturn(root.getSmartHomeEntityModel().resolveItem(request.params("identifier")), action,
() -> makeError(response, 404, "Item '" + request.params("identifier") + "' not found"));
}
......
eraser.spark/src/main/java/de/tudresden/inf/st/eraser/spark/DummyDataCreator.java
+ 1
− 1
View file @ ff9a246e
......@@ -44,7 +44,7 @@ class DummyDataCreator {
}
private Item getOrCreateColorItem(String name, String label) {
return root.getOpenHAB2Model().resolveItem(name).orElseGet(() -> {
return root.getSmartHomeEntityModel().resolveItem(name).orElseGet(() -> {
ColorItem result = new ColorItem();
result.setID(name);
result.setLabel(label);
......
eraser.starter/src/main/java/de/tudresden/inf/st/eraser/starter/EraserStarter.java
+ 2
− 2
View file @ ff9a246e
......@@ -82,7 +82,7 @@ public class EraserStarter {
boolean startRest = settings.rest.use;
Root root;
OpenHAB2Model model;
SmartHomeEntityModel model;
switch (settings.initModelWith) {
case openhab:
OpenHab2Importer importer = new OpenHab2Importer();
......@@ -101,7 +101,7 @@ public class EraserStarter {
default:
try {
root = ParserUtils.load(settings.load.realURL());
model = root.getOpenHAB2Model();
model = root.getSmartHomeEntityModel();
} catch (IOException | Parser.Exception e) {
logger.error("Problems parsing the given file {}", settings.load.file);
logger.catching(e);
......
feedbackloop.execute/src/main/java/de/tudresden/inf/st/eraser/feedbackloop/execute/ExecuteImpl.java
+ 1
− 1
View file @ ff9a246e
......@@ -61,7 +61,7 @@ public class ExecuteImpl implements Execute {
}
private void resolveOrLogError(String itemId, Consumer<? super Item> consumer) {
Optional<Item> optionalItem = knowledgeBase.getOpenHAB2Model().resolveItem(itemId);
Optional<Item> optionalItem = knowledgeBase.getSmartHomeEntityModel().resolveItem(itemId);
if (!optionalItem.isPresent()) {
logger.warn("Could not resolve '{}' as an item.", itemId);
}
......
feedbackloop.execute/src/test/java/de/tudresden/inf/st/eraser/feedbackloop/execute/ExecuteImplTest.java
+ 3
− 3
View file @ ff9a246e
......@@ -21,7 +21,7 @@ public class ExecuteImplTest {
@Test
public void testColorControlledByOneNumber() {
ModelAndItem mai = TestUtils.createModelAndItem(0);
OpenHAB2Model model = mai.model;
SmartHomeEntityModel model = mai.model;
NumberItem numberItem = mai.item;
ColorItem lamp = new ColorItem();
......@@ -47,7 +47,7 @@ public class ExecuteImplTest {
@Test
public void testColorControlledByOneBoolean() {
OpenHAB2Model model = TestUtils.createModelAndItem(0).model;
SmartHomeEntityModel model = TestUtils.createModelAndItem(0).model;
ItemWithBooleanState button = new SwitchItem();
button.setID("button");
......@@ -79,7 +79,7 @@ public class ExecuteImplTest {
@Test
public void testColorControlledByMany() {
ModelAndItem mai = TestUtils.createModelAndItem(0);
OpenHAB2Model model = mai.model;
SmartHomeEntityModel model = mai.model;
NumberItem numberItem = mai.item;
Group g = TestUtils.getDefaultGroup(model);
......
feedbackloop.learner/src/main/java/de/tudresden/inf/st/eraser/feedbackloop/learner/Main.java
+ 2
− 2
View file @ ff9a246e
......@@ -89,7 +89,7 @@ public class Main {
Root root = Root.createEmptyRoot();
Group group = new Group();
group.setID("Group1");
root.getOpenHAB2Model().addGroup(group);
root.getSmartHomeEntityModel().addGroup(group);
NumberItem monthItem = new NumberItem();
monthItem.setState(normalizedInputs.get(0));
......@@ -131,7 +131,7 @@ public class Main {
private static void createBrightnessNetwork(ArrayList<Double> all_weights, int inputBiasNumber, int hiddenlayernumber,
int hiddenlayerbias, ArrayList<Double> normalizedInputsandOutput) {
Root root = createModel(normalizedInputsandOutput, inputBiasNumber);
OpenHAB2Model model = root.getOpenHAB2Model();
SmartHomeEntityModel model = root.getSmartHomeEntityModel();
Item monthItem = model.resolveItem("month").orElseThrow(
() -> new RuntimeException("Month not found"));
Item dayItem = model.resolveItem("day").orElseThrow(
......
feedbackloop.learner_backup/src/main/java/de/tudresden/inf/st/eraser/feedbackloop.learner_backup/MachineLearningImpl.java
+ 7
− 7
View file @ ff9a246e
......@@ -39,7 +39,7 @@ public class MachineLearningImpl implements MachineLearningDecoder, MachineLearn
}
private void updateItems() {
OpenHAB2Model model = root.getOpenHAB2Model();
SmartHomeEntityModel model = root.getSmartHomeEntityModel();
List<String> targetItemNames, relevantItemNames;
switch (this.goal) {
case GOAL_ACTIVITY_PHONE_AND_WATCH:
......@@ -81,7 +81,7 @@ public class MachineLearningImpl implements MachineLearningDecoder, MachineLearn
.collect(Collectors.toList());
}
private Item resolve(OpenHAB2Model model, String id) {
private Item resolve(SmartHomeEntityModel model, String id) {
Optional<Item> maybeItem = model.resolveItem(id);
if (maybeItem.isPresent()) {
return maybeItem.get();
......@@ -97,8 +97,8 @@ public class MachineLearningImpl implements MachineLearningDecoder, MachineLearn
if(topic.equals("oh2/samsung/items1")){
new_data[0]=changedItems.get(0).influxMeasurementName();
}
model.getOpenHAB2Model().items();
Item iris_item=model.getOpenHAB2Model().resolveItem("iris_item").get();
model.getSmartHomeEntityModel().items();
Item iris_item=model.getSmartHomeEntityModel().resolveItem("iris_item").get();
iris_item.getStateAsString();*/
/* FIXME either save state of unchanged items here (if only changed items are reported) <- pull model
or let knowledge base pass all relevant items <- push model
......@@ -122,7 +122,7 @@ public class MachineLearningImpl implements MachineLearningDecoder, MachineLearn
}else if(this.goal==GOAL_PREFERENCE_BRIGHTNESS_IRIS){
String[] new_data = new String[2];
for(Item item: changedItems){
if(root.getOpenHAB2Model().getActivityItem().equals(item))
if(root.getSmartHomeEntityModel().getActivityItem().equals(item))
{
String test=item.getStateAsString();
int index = Math.round(Float.valueOf(test));
......@@ -161,7 +161,7 @@ public class MachineLearningImpl implements MachineLearningDecoder, MachineLearn
switch (this.goal) {
case GOAL_ACTIVITY_PHONE_AND_WATCH:
String activityStringValue = activity_result;
Item activityItem = resolve(this.root.getOpenHAB2Model(), "activity");
Item activityItem = resolve(this.root.getSmartHomeEntityModel(), "activity");
//activityItem.setStateFromString(activityStringValue);
// FIXME how to translate activityStringValue to a number? or should activity item state better be a String?
for (int i=0; i< activites.length;i++){
......@@ -175,7 +175,7 @@ public class MachineLearningImpl implements MachineLearningDecoder, MachineLearn
case GOAL_PREFERENCE_BRIGHTNESS_IRIS:
// String[] preference = {result[1], result[2]};
// FIXME what is the meaning of result[1] and result[2]
Item iris1 = resolve(this.root.getOpenHAB2Model(), "iris1_item");
Item iris1 = resolve(this.root.getSmartHomeEntityModel(), "iris1_item");
int color = 0;
int brightness = 0;
if (preference_result != null){
......
integration/src/main/java/de/tudresden/inf/st/eraser/integration/IntegrationMain.java
+ 2
− 2
View file @ ff9a246e
......@@ -79,14 +79,14 @@ public class IntegrationMain {
logger.info("Start!");
Root model = Main.importFromFile();
// Root model = importFromLocalFile();
logger.debug("Got model: {}", model.getOpenHAB2Model().description());
logger.debug("Got model: {}", model.getSmartHomeEntityModel().description());
MqttRoot mqttRoot = new MqttRoot();
mqttRoot.setHostByName("localhost");
mqttRoot.setIncomingPrefix("oh2/out/");
MqttTopic irisStateTopic = new MqttTopic();
irisStateTopic.setTopicString("iris1_item/state");
Item iris = null;
for (Item item : model.getOpenHAB2Model().items()) {
for (Item item : model.getSmartHomeEntityModel().items()) {
if (item.getID().equals("iris1_item")) {
iris = item;
break;
......
ml_test/src/main/java/de/tudresden/inf/st/eraser/ml_test/Main.java
+ 3
− 3
View file @ ff9a246e
......@@ -26,7 +26,7 @@ public class Main {
Root root = Root.createEmptyRoot();
Group group = new Group();
group.setID("Group1");
root.getOpenHAB2Model().addGroup(group);
root.getSmartHomeEntityModel().addGroup(group);
Item activityItem = newItem("activity", "Recognized activity", false, 8);
Item brightnessItem = newItem("brightness", "Measured brightness", false, 5);
group.addItem(activityItem);
......@@ -99,9 +99,9 @@ public class Main {
private static PreparationResult prepareNetwork() {
Root root = createModel();
Item activityItem = root.getOpenHAB2Model().resolveItem("activity").orElseThrow(
Item activityItem = root.getSmartHomeEntityModel().resolveItem("activity").orElseThrow(
() -> new RuntimeException("Activity not found"));
Item brightnessItem = root.getOpenHAB2Model().resolveItem("brightness").orElseThrow(
Item brightnessItem = root.getSmartHomeEntityModel().resolveItem("brightness").orElseThrow(
() -> new RuntimeException("Brightness not found"));
NeuralNetworkRoot nn = new NeuralNetworkRoot();
......
skywriter-hue-integration/src/main/java/de/tudresden/inf/st/eraser/skywriter_hue_integration/Main.java
+ 1
− 1
View file @ ff9a246e
......@@ -37,7 +37,7 @@ public class Main {
public static void main(String[] args) throws IOException, Parser.Exception {
// use openHAB-eraser-connection to update hue (automatically done)
Root root = ParserUtils.load("skywriter-hue.eraser", Main.class);
OpenHAB2Model model = root.getOpenHAB2Model();
SmartHomeEntityModel model = root.getSmartHomeEntityModel();
Item irisItem = model.resolveItem("iris1_item").orElseThrow(() ->
new NoSuchElementException("Iris1_item not found"));
Item skywriter1_x = model.resolveItem("skywriter1_x").orElseThrow(() ->
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment