Implement projected grades

app/src/main/java/com/manateams/scraper/GradeCalc.java

@@ -61,15 +61,22 @@ public static GradeValue cycleAverage(ClassGrades cycle) {
 		// get all categories with an average
 		final List<Category> filteredCategories = new ArrayList<Category>(cycle.categories.length);
 		for (int i = 0; i < cycle.categories.length; i++)
-			if (cycle.categories[i].average != null)
+			if (cycle.categories[i].projectedAverage != null)
+				filteredCategories.add(cycle.categories[i]);
+			else if (cycle.categories[i].average != null)
 				filteredCategories.add(cycle.categories[i]);
 
 		// take the weighted average of categories
 		double weightedTotal = 0;
 		double weights = 0;
 
 		for (Category cat : filteredCategories) {
-			weightedTotal += cat.average * cat.weight;
+			if (cat.projectedAverage != null) {
+				weightedTotal += cat.projectedAverage * cat.weight;
+			}
+			else {
+				weightedTotal += cat.average * cat.weight;
+			}
 			weights += cat.weight;
 		}
 
@@ -98,15 +105,15 @@ public static Double categoryAverage(Assignment[] assignments) {
 			if (!assignments[i].extraCredit &&
 					assignments[i].ptsEarned != null &&
 					assignments[i].ptsEarned.type == GradeValue.TYPE_DOUBLE &&
-					!assignments[i].note.contains("(Dropped)"))
+					!assignments[i].title.contains("(Dropped)"))
 				filteredAssignments.add(assignments[i]);
 
 		// take the weighted average
 		double weightedTotal = 0;
 		double weights = 0;
 
 		for (Assignment a : filteredAssignments) {
-			weightedTotal += a.ptsEarned.value_d * 100 * a.weight / a.ptsPossible;
+			weightedTotal += a.ptsEarned.value_d * a.weight;
 			weights += a.weight;
 		}
 

app/src/main/java/com/manateams/scraper/data/Assignment.java

@@ -13,6 +13,7 @@ public class Assignment {
 	public double weight;
 	public String note;
 	public boolean extraCredit;
+	public boolean isProjected;
 
 	public String pointsString() {
 		if ( ptsEarned == null || ptsEarned.value == -1)

app/src/main/java/com/manateams/scraper/data/Category.java

@@ -6,7 +6,15 @@ public class Category {
 	public String title;
 	public double weight;
 	public Double average;
+	public Double projectedAverage;
 	public double bonus;
 	public Assignment[] assignments;
 
+	public boolean hasProjected() {
+		for (Assignment a : assignments) {
+			if (a.isProjected) return true;
+		}
+		return false;
+	}
+
 }

app/src/main/java/com/manateams/scraper/data/ClassGrades.java

@@ -8,6 +8,14 @@ public class ClassGrades {
 	public int semesterIndex;
 	public int cycleIndex;
 	public int average;
+	public int projectedAverage;
 	public Category[] categories;
 
+	public boolean hasProjected() {
+		for (Category c : categories) {
+			if (c.hasProjected()) return true;
+		}
+		return false;
+	}
+
 }