Skip to content

Commit

Permalink
making first release
Browse files Browse the repository at this point in the history
  • Loading branch information
Fedor committed Oct 18, 2021
1 parent b0a6436 commit b7cfa97
Show file tree
Hide file tree
Showing 8 changed files with 97 additions and 36 deletions.
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ dependencies {
implementation project (':EE-Visualization')
implementation project (':EE-Docker')
}else {
implementation 'com.github.Apollo-Core:EE-Core:master-SNAPSHOT'
implementation 'com.github.Apollo-Core:EE-Guice:main-SNAPSHOT'
implementation 'com.github.Apollo-Core:EE-Model:main-SNAPSHOT'
implementation 'com.github.Apollo-Core:EE-IO:main-SNAPSHOT'
implementation 'com.github.Apollo-Core:EE-Enactables:master-SNAPSHOT'
implementation 'com.github.Apollo-Core:EE-Control:master-SNAPSHOT'
implementation 'com.github.Apollo-Core:SC-Core:main-SNAPSHOT'
implementation 'com.github.Apollo-Core:EE-Visualization:master-SNAPSHOT'
implementation 'com.github.Apollo-core:EE-Docker:master-SNAPSHOT'
implementation 'com.github.Apollo-Core:EE-Core:v1.0.0'
implementation 'com.github.Apollo-Core:EE-Guice:v1.0.0'
implementation 'com.github.Apollo-Core:EE-Model:v1.0.0'
implementation 'com.github.Apollo-Core:EE-IO:v1.0.0'
implementation 'com.github.Apollo-Core:EE-Enactables:v1.0.0'
implementation 'com.github.Apollo-Core:EE-Control:v1.0.0'
implementation 'com.github.Apollo-Core:SC-Core:v1.0.0'
implementation 'com.github.Apollo-Core:EE-Visualization:v1.0.0'
implementation 'com.github.Apollo-Core:EE-Docker:v1.0.0'
}

// dependency to Opt4J
Expand Down
2 changes: 1 addition & 1 deletion configs/parForComplex.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<configuration>
<module class="at.uibk.dps.ee.control.modules.EnactmentVerticleModule">
<property name="pauseOnStart">false</property>
<property name="deploymentNumber">8</property>
<property name="deploymentNumber">1</property>
</module>
<module class="at.uibk.dps.ee.io.modules.InputReaderFileModule">
<property name="filePath">./inputData/parForComplex.json</property>
Expand Down
5 changes: 1 addition & 4 deletions configs/singleAtomicConfig.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<configuration>
<module class="at.uibk.dps.ee.control.modules.EnactmentVerticleModule">
<property name="pauseOnStart">false</property>
<property name="pauseOnStart">true</property>
<property name="deploymentNumber">8</property>
</module>
<module class="at.uibk.dps.ee.docker.modules.ContainersModule">
<property name="dockerManager">DockerApi</property>
</module>
<module class="at.uibk.dps.ee.io.modules.InputReaderFileModule">
<property name="filePath">./inputData/inputSingleAtomic.json</property>
</module>
Expand Down
45 changes: 45 additions & 0 deletions demoWfs/newWhile.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
---
name: "simpleWhile"
dataIns:
- name: "input"
type: "number"
source: "inputSource"
workflowBody:
- while:
name: "while"
dataIns:
- name: "sum"
type: "number"
source: "simpleWhile/input"
loopBody:
- function:
name: "increment"
type: "Addition"
dataIns:
- name: "firstSummand"
type: "number"
source: "while/sum"
- name: "secondSummand"
type: "number"
source: 1
- name: "waitTimeIn"
type: "number"
source: 1000
dataOuts:
- name: "sum"
type: "number"
condition:
- data1: "increment/sum"
data2: 10
type: "number"
operator: "!="
negation: "false"
combinedWith: "and"
dataOuts:
- name: "sum"
type: "number"
source: "increment/sum"
dataOuts:
- name: "overallOutput"
type: "number"
source: "while/sum"
9 changes: 6 additions & 3 deletions demoWfs/parForComplex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ dataIns:
- name: "blockSize"
type: "number"
source: "blockSize"
- name: "waitTime"
type: "number"
source: "wait"
workflowBody:
- parallelFor:
name: "parallelFor"
Expand Down Expand Up @@ -37,7 +40,7 @@ workflowBody:
source: 1
- name: "waitTimeIn"
type: "number"
source: 2
source: "parForComplex/waitTime"
dataOuts:
- name: "sum"
type: "number"
Expand Down Expand Up @@ -71,7 +74,7 @@ workflowBody:
source: 1
- name: "waitTimeIn"
type: "number"
source: 2
source: "parForComplex/waitTime"
dataOuts:
- name: "sum"
type: "number"
Expand Down Expand Up @@ -107,7 +110,7 @@ workflowBody:
source: 1
- name: "waitTimeIn"
type: "number"
source: 2
source: "parForComplex/waitTime"
dataOuts:
- name: "sum"
type: "number"
Expand Down
3 changes: 2 additions & 1 deletion inputData/parForComplex.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"inputSource" : [1, 2, 3, 4],
"blockSize": 2
"blockSize": 2,
"wait": 2
}
4 changes: 2 additions & 2 deletions inputData/sixAtomic.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"input4" : 11,
"input5" : -8,
"input6" : 1,
"wait1":20,
"wait2":10
"wait1":1500,
"wait2":1500
}
47 changes: 31 additions & 16 deletions logging/config/logback.xml
Original file line number Diff line number Diff line change
@@ -1,33 +1,48 @@
<configuration debug="false">

<contextName>Demo</contextName>
<property name="fileDir" value="./logging/logs/"/>

<appender name="STDOUT"
class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%msg%n</pattern>
</encoder>
</appender>

<!-- appender to write evth above the DEBUG into a file -->
<appender name = "fileDebug" class = "ch.qos.logback.core.FileAppender">
<file>${fileDir}debug.log</file>
<append>false</append>
<filter class = "ch.qos.logback.classic.filter.ThresholdFilter">
<level>DEBUG</level>
</filter>
<encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg from %contextName%n</pattern>
</encoder>
</appender>

<!-- appender to write evth above the ERROR into a file -->
<appender name = "fileError" class = "ch.qos.logback.core.FileAppender">
<file>${fileDir}error.log</file>
<append>false</append>
<filter class = "ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
</filter>
<encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg from %contextName%n</pattern>
</encoder>
</appender>

<appender name="FUNCTION_LOG_TIME_FILE"
class="ch.qos.logback.core.FileAppender">
<file>./logging/logs/timeLog.log</file>
<append>true</append>
<immediateFlush>true</immediateFlush>
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] - %msg%n
</pattern>
</encoder>
</appender>

<logger name="io.netty" level="WARN">
</logger>


<logger
name="at.uibk.dps.ee.enactables.decorators.DecoratorTimingLog"
level="INFO" additivity="false">
<appender-ref ref="FUNCTION_LOG_TIME_FILE" />
</logger>

<root level="debug">
<root level="trace">
<appender-ref ref="STDOUT" />
<appender-ref ref="fileDebug" />
<appender-ref ref="fileError" />
</root>
</configuration>

0 comments on commit b7cfa97

Please sign in to comment.