Commit f510b1b3 authored 5 years ago by René Schöne

Merge branch 'dev' into 'master'

Updating master with current development state.

Closes #20, #14, #18, and #15

See merge request !4

parents a465e8c8 310ab641

No related branches found

No related tags found

No related merge requests found

Show whitespace changes

Inline Side-by-side

Showing

eraser-base/src/main/jastadd/eraser.flex 30 additions, 6 deletions

eraser-base/src/main/jastadd/eraser.flex
eraser-base/src/main/jastadd/eraser.parser 137 additions, 26 deletions

eraser-base/src/main/jastadd/eraser.parser
eraser-base/src/main/jastadd/main.relast 2 additions, 104 deletions

eraser-base/src/main/jastadd/main.relast
eraser-base/src/main/jastadd/mqtt.jrag 25 additions, 38 deletions

eraser-base/src/main/jastadd/mqtt.jrag
eraser-base/src/main/jastadd/mqtt.relast 4 additions, 0 deletions

eraser-base/src/main/jastadd/mqtt.relast
eraser-base/src/main/jastadd/openhab.jrag 13 additions, 0 deletions

eraser-base/src/main/jastadd/openhab.jrag
eraser-base/src/main/jastadd/openhab.relast 57 additions, 0 deletions

eraser-base/src/main/jastadd/openhab.relast
eraser-base/src/main/java/de/tudresden/inf/st/eraser/Main.java 4 additions, 35 deletions

...r-base/src/main/java/de/tudresden/inf/st/eraser/Main.java
eraser-base/src/main/java/de/tudresden/inf/st/eraser/deserializer/ASTNodeDeserializer.java 13 additions, 4 deletions

...esden/inf/st/eraser/deserializer/ASTNodeDeserializer.java
eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/Action2EditConsumer.java 11 additions, 0 deletions

...sden/inf/st/eraser/jastadd/model/Action2EditConsumer.java
eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/DoubleDoubleFunction.java 11 additions, 0 deletions

...den/inf/st/eraser/jastadd/model/DoubleDoubleFunction.java
eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/InfluxAdapter.java 1 addition, 1 deletion

.../tudresden/inf/st/eraser/jastadd/model/InfluxAdapter.java
eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/InternalMachineLearningHandler.java 59 additions, 0 deletions

.../eraser/jastadd/model/InternalMachineLearningHandler.java
eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/InternalMachineLearningResult.java 21 additions, 0 deletions

...t/eraser/jastadd/model/InternalMachineLearningResult.java
eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/ItemsToStringFunction.java 11 additions, 0 deletions

...en/inf/st/eraser/jastadd/model/ItemsToStringFunction.java
eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/MachineLearningDecoder.java 28 additions, 0 deletions

...n/inf/st/eraser/jastadd/model/MachineLearningDecoder.java
eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/MachineLearningEncoder.java 44 additions, 0 deletions

...n/inf/st/eraser/jastadd/model/MachineLearningEncoder.java
eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/MachineLearningResult.java 25 additions, 0 deletions

...en/inf/st/eraser/jastadd/model/MachineLearningResult.java
eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/MachineLearningSetRoot.java 17 additions, 0 deletions

...n/inf/st/eraser/jastadd/model/MachineLearningSetRoot.java
eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/NewStateProvider.java 11 additions, 0 deletions

...dresden/inf/st/eraser/jastadd/model/NewStateProvider.java

with 524 additions and 214 deletions

Please register or to comment