Merge branch 'master' of https://github.com/madgik/exareme into refactor/kaplan-meier-timepoint (2c28fe01) · Commits · HBP Medical Informatics Platform / exareme

Commit 2c28fe01 authored 4 years ago by

Jason Sakellariou

Browse files

Merge branch 'master' of https://github.com/madgik/exareme into refactor/kaplan-meier-timepoint

parents 6c751585 219e2b66

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
Exareme-Docker/Dockerfile 40 additions, 92 deletions

Exareme-Docker/Dockerfile
Exareme-Docker/files/root/exareme/bootstrap.sh 266 additions, 299 deletions

Exareme-Docker/files/root/exareme/bootstrap.sh
Exareme-Docker/files/root/exareme/convert-csv-dataset-to-db.py 113 additions, 77 deletions

...me-Docker/files/root/exareme/convert-csv-dataset-to-db.py
Exareme-Docker/files/root/exareme/exareme-admin.sh 4 additions, 12 deletions

Exareme-Docker/files/root/exareme/exareme-admin.sh
Exareme-Docker/files/root/exareme/set-local-datasets.sh 1 addition, 1 deletion

Exareme-Docker/files/root/exareme/set-local-datasets.sh
Exareme-Docker/files/root/exareme/start-worker.sh 3 additions, 11 deletions

Exareme-Docker/files/root/exareme/start-worker.sh
Exareme-Docker/src/exareme/exareme-master/pom.xml 8 additions, 0 deletions

Exareme-Docker/src/exareme/exareme-master/pom.xml
Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/admin/StartMaster.java 1 addition, 1 deletion

...rc/main/java/madgik/exareme/master/admin/StartMaster.java
Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/client/AdpDBClientQueryStatus.java 2 additions, 2 deletions

.../madgik/exareme/master/client/AdpDBClientQueryStatus.java
Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/client/rmi/RmiAdpDBClientQueryStatus.java 21 additions, 11 deletions

.../exareme/master/client/rmi/RmiAdpDBClientQueryStatus.java
Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/engine/executor/remote/AdpDBArtJobMonitor.java 22 additions, 14 deletions

...eme/master/engine/executor/remote/AdpDBArtJobMonitor.java
Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/engine/executor/remote/AdpDBExecutorRemote.java 0 additions, 1 deletion

...me/master/engine/executor/remote/AdpDBExecutorRemote.java
Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/engine/executor/remote/operator/process/ExecuteSelect.java 1 addition, 1 deletion

...ngine/executor/remote/operator/process/ExecuteSelect.java
Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/engine/iterations/handler/IterationsHandler.java 5 additions, 4 deletions

...e/master/engine/iterations/handler/IterationsHandler.java
Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/engine/iterations/handler/IterationsHandlerUtils.java 0 additions, 1 deletion

...ter/engine/iterations/handler/IterationsHandlerUtils.java
Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/engine/iterations/handler/NIterativeAlgorithmResultEntity.java 29 additions, 22 deletions

...e/iterations/handler/NIterativeAlgorithmResultEntity.java
Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/engine/iterations/scheduler/events/IterationsEventHandler.java 3 additions, 3 deletions

...e/iterations/scheduler/events/IterationsEventHandler.java
Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/engine/iterations/scheduler/events/phaseCompletion/PhaseCompletionEventHandler.java 1 addition, 2 deletions

...r/events/phaseCompletion/PhaseCompletionEventHandler.java
Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/engine/iterations/state/IterativeAlgorithmState.java 1 addition, 1 deletion

...ster/engine/iterations/state/IterativeAlgorithmState.java

with 522 additions and 555 deletions

Please register or to comment