Rsesolve Merge conflicts
Showing
- .gitlab-ci.yml 246 additions, 22 deletions.gitlab-ci.yml
- CITATION.cff 16 additions, 0 deletionsCITATION.cff
- README.md 7 additions, 0 deletionsREADME.md
- analysis/demand-metric-plot.ipynb 2 additions, 0 deletionsanalysis/demand-metric-plot.ipynb
- benchmarks/.gitlab-ci.yml 0 additions, 414 deletionsbenchmarks/.gitlab-ci.yml
- benchmarks/build.gradle 0 additions, 3 deletionsbenchmarks/build.gradle
- benchmarks/uc1-application/.settings/org.eclipse.jdt.ui.prefs 1 addition, 1 deletion...hmarks/uc1-application/.settings/org.eclipse.jdt.ui.prefs
- benchmarks/uc1-workload-generator/.settings/org.eclipse.jdt.ui.prefs 2 additions, 1 deletion...uc1-workload-generator/.settings/org.eclipse.jdt.ui.prefs
- benchmarks/uc1-workload-generator/src/main/java/theodolite/uc1/workloadgenerator/LoadGenerator.java 3 additions, 74 deletions.../java/theodolite/uc1/workloadgenerator/LoadGenerator.java
- benchmarks/uc2-application/Dockerfile 1 addition, 1 deletionbenchmarks/uc2-application/Dockerfile
- benchmarks/uc2-application/build.gradle 1 addition, 1 deletionbenchmarks/uc2-application/build.gradle
- benchmarks/uc2-application/src/main/java/theodolite/uc2/application/HistoryService.java 9 additions, 11 deletions.../main/java/theodolite/uc2/application/HistoryService.java
- benchmarks/uc2-application/src/main/java/theodolite/uc2/streamprocessing/TopologyBuilder.java 31 additions, 163 deletions...java/theodolite/uc2/streamprocessing/TopologyBuilder.java
- benchmarks/uc2-application/src/main/java/theodolite/uc2/streamprocessing/Uc2KafkaStreamsBuilder.java 7 additions, 36 deletions...eodolite/uc2/streamprocessing/Uc2KafkaStreamsBuilder.java
- benchmarks/uc2-application/src/main/java/theodolite/uc2/streamprocessing/util/StatsFactory.java 1 addition, 1 deletion...va/theodolite/uc2/streamprocessing/util/StatsFactory.java
- benchmarks/uc2-application/src/main/resources/META-INF/application.properties 1 addition, 5 deletions...cation/src/main/resources/META-INF/application.properties
- benchmarks/uc2-workload-generator/.settings/org.eclipse.jdt.ui.prefs 1 addition, 1 deletion...uc2-workload-generator/.settings/org.eclipse.jdt.ui.prefs
- benchmarks/uc2-workload-generator/Dockerfile 5 additions, 5 deletionsbenchmarks/uc2-workload-generator/Dockerfile
- benchmarks/uc2-workload-generator/build.gradle 1 addition, 1 deletionbenchmarks/uc2-workload-generator/build.gradle
- benchmarks/uc2-workload-generator/src/main/java/theodolite/uc2/workloadgenerator/LoadGenerator.java 5 additions, 125 deletions.../java/theodolite/uc2/workloadgenerator/LoadGenerator.java
Loading
Please register or sign in to comment