staxriver
/
poker-analytics
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring + cleanup

Browse Source
dev
Laurent 7 years ago
parent a9011ba848
commit 1d3760dc2a
5 changed files with 52 additions and 32 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 71
      app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
  2. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt
  3. 5
      app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
  4. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt
  5. 4
      app/src/main/java/net/pokeranalytics/android/ui/fragment/report/AbstractReportFragment.kt

71
app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
Unescape View File

@ -27,11 +27,11 @@ import kotlin.math.min
class Calculator { class Calculator {
/** /**
* The options used for calculations or display * The options used for calculations and display
*/ */
class Options( class Options(
var display: Display = Display.TABLE, var display: Display = Display.TABLE,
evolutionValues: EvolutionValues = EvolutionValues.NONE, progressValues: ProgressValues = ProgressValues.NONE,
var stats: List<Stat> = listOf(), var stats: List<Stat> = listOf(),
var criterias: List<Criteria> = listOf(), var criterias: List<Criteria> = listOf(),
query: Query = Query(), query: Query = Query(),
@ -41,14 +41,20 @@ class Calculator {
var reportSetupId: String? = null var reportSetupId: String? = null
) { ) {
var evolutionValues: EvolutionValues = evolutionValues /**
* Specifies whether progress values should be added and their kind
*/
var progressValues: ProgressValues = progressValues
get() { get() {
if (field == EvolutionValues.NONE && this.display == Display.PROGRESS) { if (field == ProgressValues.NONE && this.display == Display.PROGRESS) {
return EvolutionValues.STANDARD return ProgressValues.STANDARD
} }
return field return field
} }
/**
* The query used to filter data
*/
private var _query: Query = query private var _query: Query = query
init { init {
@ -56,14 +62,14 @@ class Calculator {
throw IllegalStateException("Can't specify a query with conditions AND a filter") throw IllegalStateException("Can't specify a query with conditions AND a filter")
} }
when (this.aggregationType) { this.aggregationType?.let {
AggregationType.MONTH -> this.criterias = listOf(Criteria.AllMonthsUpToNow) this.criterias = it.criterias
AggregationType.YEAR -> this.criterias = listOf(Criteria.Years)
else -> {}
} }
} }
/**
* The query used, either filter query or the provided query
*/
val query: Query val query: Query
get() { get() {
this.filter?.let { this.filter?.let {
@ -73,7 +79,7 @@ class Calculator {
} }
/** /**
* The way the statIds are going to be displayed * The way the computed stats are going to be displayed
*/ */
enum class Display : RowRepresentable { enum class Display : RowRepresentable {
TABLE, TABLE,
@ -105,13 +111,12 @@ class Calculator {
} }
} }
} }
/** /**
* The type of evolution numericValues * The type of evolution numericValues
*/ */
enum class EvolutionValues { enum class ProgressValues {
NONE, NONE,
STANDARD, STANDARD,
TIMED TIMED
@ -130,23 +135,37 @@ class Calculator {
return false return false
} }
/**
* Whether the longest streaks should be computed
*/
val computeLongestStreak: Boolean val computeLongestStreak: Boolean
get() { get() {
return this.stats.contains(LONGEST_STREAKS) return this.stats.contains(LONGEST_STREAKS)
} }
/**
* Whether the values should be sorted
*/
val shouldSortValues: Boolean val shouldSortValues: Boolean
get() { get() {
return this.evolutionValues != EvolutionValues.NONE || this.computeLongestStreak return this.progressValues != ProgressValues.NONE || this.computeLongestStreak
} }
/**
* Whether the number of locations played should be computed
*/
val computeLocationsPlayed: Boolean val computeLocationsPlayed: Boolean
get() { get() {
return this.stats.contains(LOCATIONS_PLAYED) return this.stats.contains(LOCATIONS_PLAYED)
} }
/**
* Whether the number of days played should be computed
*/
val computeDaysPlayed: Boolean val computeDaysPlayed: Boolean
get() { get() {
return this.stats.contains(DAYS_PLAYED) return this.stats.contains(DAYS_PLAYED)
} }
/**
* Whether progress values should be managed at the group level
*/
val shouldManageMultiGroupProgressValues: Boolean val shouldManageMultiGroupProgressValues: Boolean
get() { get() {
return if (this.aggregationType != null) { return if (this.aggregationType != null) {
@ -178,13 +197,15 @@ class Calculator {
stats: List<Stat>? = null stats: List<Stat>? = null
): Report { ): Report {
val options = Options(display = Options.Display.PROGRESS, val options = Options(
evolutionValues = Options.EvolutionValues.STANDARD, display = Options.Display.PROGRESS,
progressValues = Options.ProgressValues.STANDARD,
stats = listOf(stat), stats = listOf(stat),
aggregationType = aggregationType) aggregationType = aggregationType
)
if (aggregationType == AggregationType.DURATION) { if (aggregationType == AggregationType.DURATION) {
options.evolutionValues = Options.EvolutionValues.TIMED options.progressValues = Options.ProgressValues.TIMED
} }
stats?.let { stats?.let {
@ -227,7 +248,7 @@ class Calculator {
val report = Report(options) val report = Report(options)
groups.forEach { group -> groups.forEach { group ->
// val s = Date() // val s = Date()
// Clean existing computables / sessionSets if group is reused // Clean existing computables / sessionSets if group is reused
group.cleanup() group.cleanup()
@ -325,7 +346,7 @@ class Calculator {
} }
val shouldIterateOverComputables = val shouldIterateOverComputables =
(options.evolutionValues == Options.EvolutionValues.STANDARD || options.computeLongestStreak) (options.progressValues == Options.ProgressValues.STANDARD || options.computeLongestStreak)
// Computable Result // Computable Result
if (shouldIterateOverComputables) { if (shouldIterateOverComputables) {
@ -419,7 +440,7 @@ class Calculator {
} }
val shouldIterateOverSets = computableGroup.conditions.isNotEmpty() || val shouldIterateOverSets = computableGroup.conditions.isNotEmpty() ||
options.evolutionValues != Options.EvolutionValues.NONE || options.progressValues != Options.ProgressValues.NONE ||
options.computeDaysPlayed options.computeDaysPlayed
// Session Set // Session Set
@ -450,8 +471,8 @@ class Calculator {
tHourlyRateBB = tBBSum / tHourlyDuration tHourlyRateBB = tBBSum / tHourlyDuration
daysSet.add(sessionSet.startDate.startOfDay()) daysSet.add(sessionSet.startDate.startOfDay())
when (options.evolutionValues) { when (options.progressValues) {
Options.EvolutionValues.STANDARD -> { Options.ProgressValues.STANDARD -> {
results.addEvolutionValue(tHourlyRate, stat = HOURLY_RATE, data = sessionSet) results.addEvolutionValue(tHourlyRate, stat = HOURLY_RATE, data = sessionSet)
results.addEvolutionValue(tIndex.toDouble(), stat = NUMBER_OF_SETS, data = sessionSet) results.addEvolutionValue(tIndex.toDouble(), stat = NUMBER_OF_SETS, data = sessionSet)
results.addEvolutionValue( results.addEvolutionValue(
@ -472,7 +493,7 @@ class Calculator {
} }
} }
Options.EvolutionValues.TIMED -> { Options.ProgressValues.TIMED -> {
results.addEvolutionValue(tRatedNetSum, tHourlyDuration, NET_RESULT, sessionSet) results.addEvolutionValue(tRatedNetSum, tHourlyDuration, NET_RESULT, sessionSet)
results.addEvolutionValue(tHourlyRate, tHourlyDuration, HOURLY_RATE, sessionSet) results.addEvolutionValue(tHourlyRate, tHourlyDuration, HOURLY_RATE, sessionSet)
results.addEvolutionValue( results.addEvolutionValue(

2
app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt
Unescape View File

@ -188,7 +188,7 @@ class CalendarDetailsFragment : PokerAnalyticsFragment(), StaticRowRepresentable
val requiredStats: List<Stat> = listOf(Stat.LOCATIONS_PLAYED, Stat.LONGEST_STREAKS, Stat.DAYS_PLAYED, Stat.STANDARD_DEVIATION_HOURLY) val requiredStats: List<Stat> = listOf(Stat.LOCATIONS_PLAYED, Stat.LONGEST_STREAKS, Stat.DAYS_PLAYED, Stat.STANDARD_DEVIATION_HOURLY)
val options = Calculator.Options( val options = Calculator.Options(
evolutionValues = Calculator.Options.EvolutionValues.STANDARD, progressValues = Calculator.Options.ProgressValues.STANDARD,
stats = requiredStats, stats = requiredStats,
query = query query = query
) )

5
app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
Unescape View File

@ -21,7 +21,6 @@ import net.pokeranalytics.android.model.Criteria
import net.pokeranalytics.android.model.combined import net.pokeranalytics.android.model.combined
import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.filter.QueryCondition
import net.pokeranalytics.android.model.realm.ComputableResult import net.pokeranalytics.android.model.realm.ComputableResult
import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.ui.activity.CalendarDetailsActivity import net.pokeranalytics.android.ui.activity.CalendarDetailsActivity
import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
@ -262,7 +261,7 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
monthlyQueries.forEach { query -> monthlyQueries.forEach { query ->
val options = Calculator.Options( val options = Calculator.Options(
evolutionValues = Calculator.Options.EvolutionValues.STANDARD, progressValues = Calculator.Options.ProgressValues.STANDARD,
stats = requiredStats, stats = requiredStats,
query = query query = query
) )
@ -296,7 +295,7 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
yearConditions.forEach { query -> yearConditions.forEach { query ->
val options = Calculator.Options( val options = Calculator.Options(
evolutionValues = Calculator.Options.EvolutionValues.STANDARD, progressValues = Calculator.Options.ProgressValues.STANDARD,
stats = requiredStats, stats = requiredStats,
query = query query = query
) )

2
app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt
Unescape View File

@ -170,7 +170,7 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
val requiredStats: List<Stat> = listOf(Stat.NET_RESULT) val requiredStats: List<Stat> = listOf(Stat.NET_RESULT)
val options = Calculator.Options( val options = Calculator.Options(
display = Calculator.Options.Display.COMPARISON, display = Calculator.Options.Display.COMPARISON,
evolutionValues = Calculator.Options.EvolutionValues.STANDARD, progressValues = Calculator.Options.ProgressValues.STANDARD,
stats = requiredStats, stats = requiredStats,
criterias = criteriaList criterias = criteriaList
) )

4
app/src/main/java/net/pokeranalytics/android/ui/fragment/report/AbstractReportFragment.kt
Unescape View File

@ -56,11 +56,11 @@ abstract class AbstractReportFragment : DataManagerFragment() {
val nameEditText = view.findViewById<EditText>(R.id.reportName) val nameEditText = view.findViewById<EditText>(R.id.reportName)
builder.setView(view) builder.setView(view)
// Add action buttons // Add action buttons
.setPositiveButton(R.string.save) { dialog, id -> .setPositiveButton(R.string.save) { dialog, _ ->
saveReport(nameEditText.text.toString()) saveReport(nameEditText.text.toString())
dialog.dismiss() dialog.dismiss()
} }
.setNegativeButton(R.string.cancel) { dialog, id -> .setNegativeButton(R.string.cancel) { dialog, _ ->
dialog.cancel() dialog.cancel()
} }

Write Preview
Loading…
Cancel
Save