|
|
|
@ -78,8 +78,7 @@ class Calculator { |
|
|
|
TABLE, |
|
|
|
TABLE, |
|
|
|
PROGRESS, |
|
|
|
PROGRESS, |
|
|
|
COMPARISON, |
|
|
|
COMPARISON, |
|
|
|
MAP, |
|
|
|
MAP; |
|
|
|
POLYNOMIAL; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
override val resId: Int? |
|
|
|
override val resId: Int? |
|
|
|
get() { |
|
|
|
get() { |
|
|
|
@ -88,7 +87,6 @@ class Calculator { |
|
|
|
PROGRESS -> R.string.progress |
|
|
|
PROGRESS -> R.string.progress |
|
|
|
COMPARISON -> R.string.comparison |
|
|
|
COMPARISON -> R.string.comparison |
|
|
|
MAP -> R.string.map |
|
|
|
MAP -> R.string.map |
|
|
|
POLYNOMIAL -> null |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -99,9 +97,6 @@ class Calculator { |
|
|
|
PROGRESS -> ProgressReportActivity::class.java |
|
|
|
PROGRESS -> ProgressReportActivity::class.java |
|
|
|
COMPARISON -> ComparisonReportActivity::class.java |
|
|
|
COMPARISON -> ComparisonReportActivity::class.java |
|
|
|
else -> throw PAIllegalStateException("undefined activity for report display") |
|
|
|
else -> throw PAIllegalStateException("undefined activity for report display") |
|
|
|
// MAP -> R.string.map |
|
|
|
|
|
|
|
// POLYNOMIAL -> null |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -135,6 +130,7 @@ class Calculator { |
|
|
|
get() { |
|
|
|
get() { |
|
|
|
return this.stats.contains(LONGEST_STREAKS) |
|
|
|
return this.stats.contains(LONGEST_STREAKS) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* Whether the values should be sorted |
|
|
|
* Whether the values should be sorted |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@ -142,6 +138,7 @@ class Calculator { |
|
|
|
get() { |
|
|
|
get() { |
|
|
|
return this.progressValues != ProgressValues.NONE || this.computeLongestStreak |
|
|
|
return this.progressValues != ProgressValues.NONE || this.computeLongestStreak |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* Whether the number of locations played should be computed |
|
|
|
* Whether the number of locations played should be computed |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
|