mirror of
https://github.com/plan-player-analytics/Plan.git
synced 2024-11-16 07:35:15 +01:00
Groundwork for #1050
This commit is contained in:
parent
26f76d9540
commit
5dd2d4392e
@ -0,0 +1,75 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of Player Analytics (Plan).
|
||||||
|
*
|
||||||
|
* Plan is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License v3 as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Plan is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package com.djrapitops.plan.delivery.domain;
|
||||||
|
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
public class TimeSegment<T> {
|
||||||
|
|
||||||
|
private final long start;
|
||||||
|
private final long end;
|
||||||
|
private final T value;
|
||||||
|
|
||||||
|
public TimeSegment(long start, long end, T value) {
|
||||||
|
this.start = start;
|
||||||
|
this.end = end;
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static <V> Comparator<TimeSegment<V>> earliestStartFirstComparator() {
|
||||||
|
return Comparator.comparingLong(segment -> segment.start);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static <V> Comparator<TimeSegment<V>> earliestEndFirstComparator() {
|
||||||
|
return Comparator.comparingLong(segment -> segment.end);
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getStart() {
|
||||||
|
return start;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getEnd() {
|
||||||
|
return end;
|
||||||
|
}
|
||||||
|
|
||||||
|
public T getValue() {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (this == o) return true;
|
||||||
|
if (o == null || getClass() != o.getClass()) return false;
|
||||||
|
TimeSegment<?> that = (TimeSegment<?>) o;
|
||||||
|
return getStart() == that.getStart() && getEnd() == that.getEnd() && Objects.equals(getValue(), that.getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(getStart(), getEnd(), getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "TimeSegment{" +
|
||||||
|
"start=" + start +
|
||||||
|
", end=" + end +
|
||||||
|
", value=" + value +
|
||||||
|
'}';
|
||||||
|
}
|
||||||
|
}
|
@ -31,6 +31,7 @@ import com.djrapitops.plan.gathering.domain.event.JoinAddress;
|
|||||||
import com.djrapitops.plan.identification.ServerUUID;
|
import com.djrapitops.plan.identification.ServerUUID;
|
||||||
import com.djrapitops.plan.settings.config.WorldAliasSettings;
|
import com.djrapitops.plan.settings.config.WorldAliasSettings;
|
||||||
import com.djrapitops.plan.utilities.analysis.Median;
|
import com.djrapitops.plan.utilities.analysis.Median;
|
||||||
|
import com.djrapitops.plan.utilities.comparators.DateHolderOldestComparator;
|
||||||
import com.djrapitops.plan.utilities.java.Lists;
|
import com.djrapitops.plan.utilities.java.Lists;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@ -102,6 +103,10 @@ public class SessionsMutator {
|
|||||||
return sessions;
|
return sessions;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public TimeSegmentsMutator<Integer> onlineTimeSegments() {
|
||||||
|
return TimeSegmentsMutator.sessionClockSegments(sort(new DateHolderOldestComparator()).all());
|
||||||
|
}
|
||||||
|
|
||||||
public SessionsMutator filterPlayedOnServer(ServerUUID serverUUID) {
|
public SessionsMutator filterPlayedOnServer(ServerUUID serverUUID) {
|
||||||
return filterBy(session ->
|
return filterBy(session ->
|
||||||
session.getServerUUID().equals(serverUUID)
|
session.getServerUUID().equals(serverUUID)
|
||||||
|
@ -0,0 +1,59 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of Player Analytics (Plan).
|
||||||
|
*
|
||||||
|
* Plan is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License v3 as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Plan is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package com.djrapitops.plan.delivery.domain.mutators;
|
||||||
|
|
||||||
|
import com.djrapitops.plan.delivery.domain.DateObj;
|
||||||
|
import com.djrapitops.plan.delivery.domain.TimeSegment;
|
||||||
|
import com.djrapitops.plan.gathering.domain.FinishedSession;
|
||||||
|
import com.djrapitops.plan.utilities.comparators.DateHolderOldestComparator;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
public class TimeSegmentsMutator<T> {
|
||||||
|
|
||||||
|
List<TimeSegment<T>> segments;
|
||||||
|
|
||||||
|
public TimeSegmentsMutator(List<TimeSegment<T>> segments) {
|
||||||
|
this.segments = segments;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TimeSegmentsMutator<Integer> sessionClockSegments(List<FinishedSession> sessions) {
|
||||||
|
List<DateObj<Integer>> changes = new ArrayList<>();
|
||||||
|
|
||||||
|
for (FinishedSession session : sessions) {
|
||||||
|
long startTime = (session.getStart()) % TimeUnit.DAYS.toMillis(1);
|
||||||
|
long endTime = (session.getEnd()) % TimeUnit.DAYS.toMillis(1);
|
||||||
|
changes.add(new DateObj<>(startTime, 1));
|
||||||
|
changes.add(new DateObj<>(endTime, -1));
|
||||||
|
}
|
||||||
|
|
||||||
|
changes.sort(new DateHolderOldestComparator());
|
||||||
|
|
||||||
|
int count = 0;
|
||||||
|
long previousTime = 0L;
|
||||||
|
List<TimeSegment<Integer>> segments = new ArrayList<>();
|
||||||
|
for (DateObj<Integer> change : changes) {
|
||||||
|
segments.add(new TimeSegment<>(previousTime, change.getDate(), count));
|
||||||
|
count += change.getValue();
|
||||||
|
previousTime = change.getDate();
|
||||||
|
}
|
||||||
|
|
||||||
|
return new TimeSegmentsMutator<>(segments);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user