Skip to content
Snippets Groups Projects
Commit edf7fb35 authored by Jaret Wrintmore's avatar Jaret Wrintmore
Browse files

Orins change

parent e516e6c1
No related branches found
No related tags found
1 merge request!1Calculators and main
package Access;
import Packets.ClickInfo;
import Packets.ImpInfo;
import Packets.ServInfo;
import Packets.ImpressionInfo;
import Packets.ServerInfo;
import java.util.ArrayList;
......@@ -31,13 +31,13 @@ public class Translator {
* Take arraylist of strings & return arraylist of info
* Date, ID, Gender, Age, Income, Context, Cost
*/
public static ArrayList<ImpInfo> impressionReader(ArrayList<String> impressions) {
ArrayList<ImpInfo> allImpressions = new ArrayList<>();
public static ArrayList<ImpressionInfo> impressionReader(ArrayList<String> impressions) {
ArrayList<ImpressionInfo> allImpressions = new ArrayList<>();
//Convert each click into click-info & add to list
for (String impression : impressions) {
String[] impSplit = impression.split(",");
allImpressions.add(new ImpInfo(impSplit[0], impSplit[1], impSplit[2], impSplit[3], impSplit[4], impSplit[5], impSplit[6]));
allImpressions.add(new ImpressionInfo(impSplit[0], impSplit[1], impSplit[2], impSplit[3], impSplit[4], impSplit[5], impSplit[6]));
}
return allImpressions;
......@@ -47,13 +47,13 @@ public class Translator {
* Take arraylist of strings & return arraylist of info
* Date, ID, Maybe Exit Date, Maybe Exit Time, Pages Viewed, Conversion
*/
public static ArrayList<ServInfo> serverReader(ArrayList<String> servers) {
ArrayList<ServInfo> allServer = new ArrayList<>();
public static ArrayList<ServerInfo> serverReader(ArrayList<String> servers) {
ArrayList<ServerInfo> allServer = new ArrayList<>();
//Convert each click into click-info & add to list
for (String server : servers) {
String[] servSplit = server.split(",");
allServer.add(new ServInfo(servSplit[0], servSplit[1], servSplit[2], servSplit[3], servSplit[4]));
allServer.add(new ServerInfo(servSplit[0], servSplit[1], servSplit[2], servSplit[3], servSplit[4]));
}
return allServer;
......
package Calculators;
import java.util.ArrayList;
import Packets.BounceDefinition;
import Packets.ClickInfo;
import Packets.CompiledData;
/**
......@@ -9,6 +12,8 @@ import Packets.CompiledData;
public class MetricCalculator {
public Metrics calculateMetrics(CompiledData compiledData, BounceDefinition bounceDefinition) {
Integer noOfImpressions = compiledData.getImpressionData().getImpressionData().length();
Integer noOfImpressions = compiledData.getImpressionData().length;
ClickInfo[] clickInfoList = compiledData.getClickData();
Integer noOfClicks = clickInfoList.length;
}
}
\ No newline at end of file
......@@ -5,27 +5,27 @@ package Packets;
* Also a coupling class
*/
public class CompiledData {
private ServerData serverData;
private ImpressionData impressionData;
private ClickData clickData;
private ServerInfo[] allServerInfo;
private ImpressionInfo[] allImpressionInfo;
private ClickInfo[] allClickInfo;
//TODO: The conecting classes
public CompiledData(ServerData serverData, ImpressionData impressionData, ClickData clickData) {
this.serverData = serverData;
this.impressionData = impressionData;
this.clickData = clickData;
public CompiledData(ServerInfo[] allServerInfo, ImpressionInfo[] allImpressionInfo, ClickInfo[] allClickInfo) {
this.allServerInfo = allServerInfo;
this.allImpressionInfo = allImpressionInfo;
this.allClickInfo = allClickInfo;
}
public ServerData getServerData() {
return serverData;
public ServerInfo[] getServerInfo() {
return allServerInfo;
}
public ImpressionData getImpressionData() {
return impressionData;
public ImpressionInfo[] getImpressionInfo() {
return allImpressionInfo;
}
public ClickData getClickData() {
return clickData;
public ClickInfo[] getClickInfo() {
return allClickInfo;
}
}
......@@ -5,14 +5,14 @@ package Packets;
* Store impression-info as data type
* Date, ID, Gender, Age, Income, Context & cost per impression
*/
public class ImpInfo extends InfoType {
public class ImpressionInfo extends InfoType {
private final char gender;
private final int age;
private final char income;
private final String context;
private final float cost;
public ImpInfo(String inDate, String inID, String inGender, String inAge, String inIncome, String inContext, String inCost) {
public ImpressionInfo(String inDate, String inID, String inGender, String inAge, String inIncome, String inContext, String inCost) {
super(inDate, inID);
gender = inGender.charAt(0);
age = setAge(inAge);
......
......@@ -4,12 +4,12 @@ package Packets;
* Store server-info as data type
* Date, ID, Maybe Exit Date, Pages Viewed, Conversion
*/
public class ServInfo extends InfoType {
public class ServerInfo extends InfoType {
private final int[] leaveDate;
private final int pages;
private final boolean converted;
public ServInfo(String inDate, String inID, String inExitDate, String inPages, String inConversion) {
public ServerInfo(String inDate, String inID, String inExitDate, String inPages, String inConversion) {
super(inDate, inID);
//Store date as list of ints if applicable (No date is empty list)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment