caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

improve calculation workflow behavior

Browse source
This commit is contained in:
Milos Kozak 2023-08-16 13:54:23 +02:00
parent 551af710b6
commit 6ebec7935d
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/info/nightscout/androidaps/workflow/CalculationWorkflowImpl.kt
View file

@ -198,23 +198,23 @@ class CalculationWorkflowImpl @Inject constructor(
.build() .build()
) )
.then( .then(
job == MAIN_CALCULATION, runIf = job == MAIN_CALCULATION,
OneTimeWorkRequest.Builder(UpdateGraphWorker::class.java) OneTimeWorkRequest.Builder(UpdateGraphWorker::class.java)
.setInputData(Data.Builder().putString(JOB, job).putInt(PASS, CalculationWorkflow.ProgressData.DRAW_IOB.pass).build()) .setInputData(Data.Builder().putString(JOB, job).putInt(PASS, CalculationWorkflow.ProgressData.DRAW_IOB.pass).build())
.build() .build()
) )
.then( .then(
job == MAIN_CALCULATION, runIf = job == MAIN_CALCULATION,
OneTimeWorkRequest.Builder(InvokeLoopWorker::class.java) OneTimeWorkRequest.Builder(InvokeLoopWorker::class.java)
.setInputData(dataWorkerStorage.storeInputData(InvokeLoopWorker.InvokeLoopData(cause))) .setInputData(dataWorkerStorage.storeInputData(InvokeLoopWorker.InvokeLoopData(cause)))
.build() .build()
) )
.then( .then(
job == MAIN_CALCULATION, runIf = job == MAIN_CALCULATION,
OneTimeWorkRequest.Builder(UpdateWidgetWorker::class.java).build() OneTimeWorkRequest.Builder(UpdateWidgetWorker::class.java).build()
) )
.then( .then(
job == MAIN_CALCULATION, runIf = job == MAIN_CALCULATION,
OneTimeWorkRequest.Builder(PreparePredictionsWorker::class.java) OneTimeWorkRequest.Builder(PreparePredictionsWorker::class.java)
.setInputData(dataWorkerStorage.storeInputData(PreparePredictionsWorker.PreparePredictionsData(overviewData))) .setInputData(dataWorkerStorage.storeInputData(PreparePredictionsWorker.PreparePredictionsData(overviewData)))
.build() .build()

1
workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt
View file

@ -57,6 +57,7 @@ class PrepareBasalDataWorker(
val fromTime = data.overviewData.fromTime val fromTime = data.overviewData.fromTime
var time = fromTime var time = fromTime
while (time < endTime) { while (time < endTime) {
if (isStopped) return Result.failure(workDataOf("Error" to "stopped"))
val progress = (time - fromTime).toDouble() / (endTime - fromTime) * 100.0 val progress = (time - fromTime).toDouble() / (endTime - fromTime) * 100.0
rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_BASAL_DATA, progress.toInt(), null)) rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_BASAL_DATA, progress.toInt(), null))
val profile = profileFunction.getProfile(time) val profile = profileFunction.getProfile(time)

1
workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt
View file

@ -158,6 +158,7 @@ class PrepareIobAutosensGraphDataWorker(
val adsData = data.iobCobCalculator.ads.clone() val adsData = data.iobCobCalculator.ads.clone()
while (time <= endTime) { while (time <= endTime) {
if (isStopped) return Result.failure(workDataOf("Error" to "stopped"))
val progress = (time - fromTime).toDouble() / (endTime - fromTime) * 100.0 val progress = (time - fromTime).toDouble() / (endTime - fromTime) * 100.0
rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_IOB_AUTOSENS_DATA, progress.toInt(), null)) rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_IOB_AUTOSENS_DATA, progress.toInt(), null))
val profile = profileFunction.getProfile(time) val profile = profileFunction.getProfile(time)

1
workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt
View file

@ -58,6 +58,7 @@ class PrepareTemporaryTargetDataWorker(
loop.lastRun?.constraintsProcessed?.let { endTime = max(it.latestPredictionsTime, endTime) } loop.lastRun?.constraintsProcessed?.let { endTime = max(it.latestPredictionsTime, endTime) }
var time = fromTime var time = fromTime
while (time < endTime) { while (time < endTime) {
if (isStopped) return Result.failure(workDataOf("Error" to "stopped"))
val progress = (time - fromTime).toDouble() / (endTime - fromTime) * 100.0 val progress = (time - fromTime).toDouble() / (endTime - fromTime) * 100.0
rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_TEMPORARY_TARGET_DATA, progress.toInt(), null)) rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_TEMPORARY_TARGET_DATA, progress.toInt(), null))
val tt = repository.getTemporaryTargetActiveAt(time).blockingGet() val tt = repository.getTemporaryTargetActiveAt(time).blockingGet()