|
|
|
|
@ -13,7 +13,6 @@ import net.pokeranalytics.android.model.realm.ComputableResult |
|
|
|
|
import net.pokeranalytics.android.model.realm.Filter |
|
|
|
|
import net.pokeranalytics.android.model.realm.SessionSet |
|
|
|
|
import net.pokeranalytics.android.util.extensions.startOfDay |
|
|
|
|
import timber.log.Timber |
|
|
|
|
import java.util.* |
|
|
|
|
import kotlin.math.max |
|
|
|
|
import kotlin.math.min |
|
|
|
|
@ -180,7 +179,7 @@ class Calculator { |
|
|
|
|
val computableGroups: MutableList<ComputableGroup> = mutableListOf() |
|
|
|
|
|
|
|
|
|
val combinations = options.criterias.combined() |
|
|
|
|
Timber.d("Combinations: ${ combinations.map { it.defaultName }}") |
|
|
|
|
// Timber.d("Combinations: ${ combinations.map { it.defaultName }}") |
|
|
|
|
|
|
|
|
|
for (comparatorQuery in combinations) { |
|
|
|
|
comparatorQuery.merge(options.query) |
|
|
|
|
|