Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-04-03 18:55:49 +02:00
Code Issues Projects Releases Wiki Activity

Add New Players Graphs to Online Activity

Browse Source
This commit is contained in:
Rsl1122 2017-07-27 17:44:17 +03:00
parent 230eb7fc82
commit f5274a2069
7 changed files with 179 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Plan/src/main/java/com/djrapitops/plan/data/analysis/JoinInfoPart.java
View File

@ -3,6 +3,7 @@ package main.java.com.djrapitops.plan.data.analysis;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.utilities.Verify;
import main.java.com.djrapitops.plan.data.SessionData;
import main.java.com.djrapitops.plan.ui.html.graphs.NewPlayersGraphCreator;
import main.java.com.djrapitops.plan.utilities.MiscUtils;
import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils;
@ -18,7 +19,8 @@ import java.util.stream.Collectors;
* <p>
* Contains following place-holders: totallogins, uniquejoinsday,
* uniquejoinsweek, uniquejoinsmonth, avguniquejoins, avguniquejoinsday,
* avguniquejoinsweek, avguniquejoinsmonth, npday, npweek, npmonth
* avguniquejoinsweek, avguniquejoinsmonth, npday, npweek, npmonth,
* npdataday, npdataweek, npdatamonth, newperday, newperdayday, newperdayweek, newpermonth
*
* @author Rsl1122
* @since 3.5.2
@ -67,13 +69,32 @@ public class JoinInfoPart extends RawData<JoinInfoPart> {
}
private void newPlayers() {
int newDay = AnalysisUtils.getNewPlayers(registered, TimeAmount.DAY.ms(), MiscUtils.getTime());
int newWeek = AnalysisUtils.getNewPlayers(registered, TimeAmount.WEEK.ms(), MiscUtils.getTime());
int newMonth = AnalysisUtils.getNewPlayers(registered, TimeAmount.MONTH.ms(), MiscUtils.getTime());
long now = MiscUtils.getTime();
long newDay = AnalysisUtils.getNewPlayers(registered, TimeAmount.DAY.ms(), now);
long newWeek = AnalysisUtils.getNewPlayers(registered, TimeAmount.WEEK.ms(), now);
long newMonth = AnalysisUtils.getNewPlayers(registered, TimeAmount.MONTH.ms(), now);
addValue("npday", newDay);
addValue("npweek", newWeek);
addValue("npmonth", newMonth);
long newPerDay = AnalysisUtils.getNewUsersPerDay(registered, -1);
long newPerDayDay = AnalysisUtils.getNewUsersPerDay(registered, TimeAmount.DAY.ms());
long newPerDayWeek = AnalysisUtils.getNewUsersPerDay(registered, TimeAmount.WEEK.ms());
long newPerDayMonth = AnalysisUtils.getNewUsersPerDay(registered, TimeAmount.MONTH.ms());
addValue("newperday", newPerDay);
addValue("newperdayday", newPerDayDay);
addValue("newperdayweek", newPerDayWeek);
addValue("newperdaymonth", newPerDayMonth);
String scatterDay = NewPlayersGraphCreator.buildScatterDataString(registered, TimeAmount.DAY.ms(), now);
String scatterWeek = NewPlayersGraphCreator.buildScatterDataString(registered, TimeAmount.WEEK.ms(), now);
String scatterMonth = NewPlayersGraphCreator.buildScatterDataString(registered, TimeAmount.MONTH.ms(), now);
addValue("npdataday", scatterDay);
addValue("npdataweek", scatterWeek);
addValue("npdatamonth", scatterMonth);
}
public void addToLoginTimes() {

23
Plan/src/main/java/com/djrapitops/plan/ui/html/graphs/NewPlayersGraphCreator.java Normal file
View File

@ -0,0 +1,23 @@
package main.java.com.djrapitops.plan.ui.html.graphs;
import main.java.com.djrapitops.plan.utilities.analysis.Point;
import java.util.List;
import java.util.stream.Collectors;
public class NewPlayersGraphCreator {
public static String buildScatterDataString(List<Long> registered, long scale, long now) {
List<Long> filtered = registered.stream()
.filter(date -> date >= now - scale).collect(Collectors.toList());
List<Point> points = filtered.stream()
.distinct()
.map(date -> new Point(date, getCount(filtered, date)))
.collect(Collectors.toList());
return ScatterGraphCreator.scatterGraph(points, true);
}
private static long getCount(List<Long> filtered, long lookFor) {
return filtered.stream().filter(date -> lookFor == date).count();
}
}

5
Plan/src/main/java/com/djrapitops/plan/ui/html/graphs/RamGraphCreator.java Normal file
View File

@ -0,0 +1,5 @@
package main.java.com.djrapitops.plan.ui.html.graphs;
public class RamGraphCreator {
// TODO
}

5
Plan/src/main/java/com/djrapitops/plan/ui/html/graphs/WorldLoadGraphCreator.java Normal file
View File

@ -0,0 +1,5 @@
package main.java.com.djrapitops.plan.ui.html.graphs;
public class WorldLoadGraphCreator {
// TODO
}

53
Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java
View File

@ -47,13 +47,13 @@ public class AnalysisUtils {
* @param now
* @return
*/
public static int getNewPlayers(List<Long> registered, long scale, long now) {
int newPlayers = 0;
public static long getNewPlayers(List<Long> registered, long scale, long now) {
long newPlayers = 0;
if (!registered.isEmpty()) {
newPlayers = registered.stream()
.filter((reg) -> (reg != null))
.filter((reg) -> (reg > now - scale))
.map((_item) -> 1).reduce(newPlayers, Integer::sum);
.filter(Objects::nonNull)
.filter(reg -> reg > now - scale)
.count();
}
// Filters out register dates before scale
return newPlayers;
@ -200,9 +200,11 @@ public class AnalysisUtils {
}
/**
* @param sessions
* @param scale
* @return
* Used to calculate unique players that have played within the time frame determined by scale.
*
* @param sessions All sessions sorted in a map by User's UUID
* @param scale Scale (milliseconds), time before (Current epoch - scale) will be ignored.
* @return Amount of Unique joins within the time span.
*/
public static int getUniqueJoins(Map<UUID, List<SessionData>> sessions, long scale) {
long now = MiscUtils.getTime();
@ -245,11 +247,33 @@ public class AnalysisUtils {
}
});
int total = MathUtils.sumInt(uniqueJoins.values().stream().map(Set::size));
int size = uniqueJoins.keySet().size();
if (size == 0) {
int numberOfDays = uniqueJoins.keySet().size();
if (numberOfDays == 0) {
return 0;
}
return total / size;
return total / numberOfDays;
}
public static long getNewUsersPerDay(List<Long> registers, long scale) {
long now = MiscUtils.getTime();
long nowMinusScale = now - scale;
Set<Integer> days = new HashSet<>();
for (Long date : registers) {
if (scale != -1) {
if (date < nowMinusScale) {
continue;
}
int day = getDayOfYear(date);
days.add(day);
}
}
long total = registers.stream().filter(date -> date >= nowMinusScale).count();
int numberOfDays = days.size();
if (numberOfDays == 0) {
return 0;
}
return total / numberOfDays;
}
/**
@ -277,8 +301,13 @@ public class AnalysisUtils {
}
private static int getDayOfYear(SessionData session) {
return getDayOfYear(session.getSessionStart());
}
private static int getDayOfYear(long date) {
Calendar day = Calendar.getInstance();
day.setTimeInMillis(session.getSessionStart());
day.setTimeInMillis(date);
return day.get(Calendar.DAY_OF_YEAR);
}
}

81
Plan/src/main/resources/analysis.html
View File

@ -382,7 +382,7 @@
<i class="fa fa-calendar-plus-o" aria-hidden="true"></i> Total Login times:
%totallogins%<br/>
<i class="fa fa-user-circle-o" aria-hidden="true"></i> Average Unique Players/Day:
%avguniquejoins%<br>
%avguniquejoins% | <i class="fa fa-user-plus" aria-hidden="true"></i> Average New/Day: %newperday%<br>
<b><i class="fa fa-crosshairs" aria-hidden="true"></i></b> Player kills: %playerkills% | <i
class="fa fa-crosshairs" aria-hidden="true"></i> Mob kills: %mobkills% | <i
class="fa fa-meh-o" aria-hidden="true"></i> Deaths: %deaths%</p>
@ -473,7 +473,9 @@
</div>
<canvas id="playerChartDay2" width="1000" height="350" style="width: 95%;"></canvas>
<p><i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsday% | <i
class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsday%</p>
class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsday% | <i
class="fa fa-user-plus" aria-hidden="true"></i> New/Day: %newperdayday%
</p>
</div>
<div class=" box column">
<div class="headerbox">
@ -497,7 +499,9 @@
</div>
<canvas id="playerChartWeek" width="1000" height="350" style="width: 95%;"></canvas>
<p><i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsweek% | <i
class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsweek%</p>
class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsweek% | <i
class="fa fa-user-plus" aria-hidden="true"></i> New/Day: %newperdayweek%
</p>
</div>
<div class=" box column">
<div class="headerbox">
@ -521,7 +525,8 @@
</div>
<canvas id="playerChartMonth" width="1000" height="350" style="width: 95%;"></canvas>
<p><i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsmonth% | <i
class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsmonth%
class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsmonth% | <i
class="fa fa-user-plus" aria-hidden="true"></i> New/Day: %newperdaymonth%
</p>
</div>
</div>
@ -946,7 +951,29 @@
pointRadius: 1,
pointHitRadius: 10,
spanGaps: false,
data: %datascatterday% ,
data: %datascatterday%
},
{
label: "New Players",
fill: true,
lineTension: 0.1,
backgroundColor: "#fff",
borderColor: "#7dcc24",
borderCapStyle: 'butt',
borderDash: [],
borderDashOffset: 0.0,
borderJoinStyle: 'miter',
pointBorderColor: "#7dcc24",
pointBackgroundColor: "#fff",
pointBorderWidth: 1,
pointHoverRadius: 5,
pointHoverBackgroundColor: "#7dcc24",
pointHoverBorderColor: "#8fabc6",
pointHoverBorderWidth: 2,
pointRadius: 1,
pointHitRadius: 10,
spanGaps: false,
data: %npdataday%
}]
}
var dataweek = {
@ -972,6 +999,28 @@
pointHitRadius: 10,
spanGaps: false,
data: %datascatterweek% ,
},
{
label: "New Players",
fill: true,
lineTension: 0.1,
backgroundColor: "#fff",
borderColor: "#7dcc24",
borderCapStyle: 'butt',
borderDash: [],
borderDashOffset: 0.0,
borderJoinStyle: 'miter',
pointBorderColor: "#7dcc24",
pointBackgroundColor: "#fff",
pointBorderWidth: 1,
pointHoverRadius: 5,
pointHoverBackgroundColor: "#7dcc24",
pointHoverBorderColor: "#8fabc6",
pointHoverBorderWidth: 2,
pointRadius: 1,
pointHitRadius: 10,
spanGaps: false,
data: %npdataweek%
}]
}
var datamonth = {
@ -997,6 +1046,28 @@
pointHitRadius: 10,
spanGaps: false,
data: %datascattermonth% ,
},
{
label: "New Players",
fill: true,
lineTension: 0.1,
backgroundColor: "#fff",
borderColor: "#7dcc24",
borderCapStyle: 'butt',
borderDash: [],
borderDashOffset: 0.0,
borderJoinStyle: 'miter',
pointBorderColor: "#7dcc24",
pointBackgroundColor: "#fff",
pointBorderWidth: 1,
pointHoverRadius: 5,
pointHoverBackgroundColor: "#7dcc24",
pointHoverBorderColor: "#8fabc6",
pointHoverBorderWidth: 2,
pointRadius: 1,
pointHitRadius: 10,
spanGaps: false,
data: %npdatamonth%
}]
}
var playersChartDay = new Chart(ctxday, {

10
Plan/src/test/java/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtilsTest.java
View File

@ -101,9 +101,8 @@ public class AnalysisUtilsTest {
registered.add(1L);
long scale = 8L;
long now = 10L;
int expResult = 1;
int result = AnalysisUtils.getNewPlayers(registered, scale, now);
assertEquals(expResult, result);
long result = AnalysisUtils.getNewPlayers(registered, scale, now);
assertEquals(1L, result);
}
/**
@ -114,9 +113,8 @@ public class AnalysisUtilsTest {
List<Long> registered = new ArrayList<>();
long scale = 1L;
long now = 2L;
int expResult = 0;
int result = AnalysisUtils.getNewPlayers(registered, scale, now);
assertEquals(expResult, result);
long result = AnalysisUtils.getNewPlayers(registered, scale, now);
assertEquals(0L, result);
}
/**