67 add control strategy recommendations

src/main/java/uk/ac/soton/itinnovation/security/model/system/RiskLevelCount.java

@@ -24,14 +24,15 @@
 /////////////////////////////////////////////////////////////////////////
 package uk.ac.soton.itinnovation.security.model.system;
 
+import java.util.Objects;
 import uk.ac.soton.itinnovation.security.model.Level;
 
-public class RiskLevelCount {
-	
+public class RiskLevelCount implements Comparable<RiskLevelCount> {
+
 	private Level level;
-			
+
 	private int count;
-	
+
 	public RiskLevelCount() {
 	}
 
@@ -50,6 +51,30 @@ public int getCount() {
 	public void setCount(int count) {
 		this.count = count;
 	}
-
-
+
+    @Override
+    public int compareTo(RiskLevelCount other) {
+        // Compare levels first
+        int levelComparison = this.level.compareTo(other.level);
+        if (levelComparison != 0) {
+            return levelComparison;
+        }
+
+        // If levels are equal, compare counts
+        return Integer.compare(this.count, other.count);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        RiskLevelCount that = (RiskLevelCount) obj;
+        return count == that.count && Objects.equals(level, that.level);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(level, count);
+    }
+
 }

src/main/java/uk/ac/soton/itinnovation/security/model/system/RiskVector.java

@@ -29,13 +29,13 @@
 import java.util.Map;
 import uk.ac.soton.itinnovation.security.model.Level;
 
-public class RiskVector {
-	
+public class RiskVector implements Comparable<RiskVector> {
+
 	private Map<String, RiskLevelCount> riskVector;
 
 	public RiskVector(Collection<Level> riskLevels, Map<String, Integer> riskLevelCounts) {
 		riskVector = new HashMap<>();
-		
+
 		//For each defined risk level, get the count of misbehaviours at this level
 		for (Level riskLevel : riskLevels) {
 			RiskLevelCount riskLevelCount = new RiskLevelCount();
@@ -57,23 +57,63 @@ public void setRiskVector(Map<String, RiskLevelCount> riskVector) {
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
-		
+
 		sb.append("(");
-		
+
 		Collection<RiskLevelCount> riskLevelCounts = riskVector.values();
-		
+
 		for (RiskLevelCount riskLevelCount : riskLevelCounts) {
 			sb.append(riskLevelCount.getLevel().getLabel());
 			sb.append(": ");
 			sb.append(riskLevelCount.getCount());
 			sb.append(", ");
 		}
-		
+
 		sb.setLength(sb.length() -2); //remove last comma
-		
+
 		sb.append(")");
-		
+
 		return sb.toString();
 	}
 
+    public String getOverall() {
+        int overall = 0;
+        String label = "";
+        for (Map.Entry<String, RiskLevelCount> entry : riskVector.entrySet()) {
+            String riskLevelLabel = entry.getValue().getLevel().getUri();
+            int riskLevelValue = entry.getValue().getLevel().getValue();
+            int riskCount = entry.getValue().getCount();
+            if (riskCount > 0) {
+                if (riskLevelValue >= overall) {
+                    overall = riskLevelValue;
+                    label = riskLevelLabel;
+                }
+            }
+        }
+        return label;
+    }
+
+    @Override
+    public int compareTo(RiskVector other) {
+        // Iterate through map entries and compare RiskLevelCount objects
+        for (Map.Entry<String, RiskLevelCount> entry : riskVector.entrySet()) {
+            String key = entry.getKey();
+            RiskLevelCount thisRiskLevelCount = entry.getValue();
+            RiskLevelCount otherRiskLevelCount = other.riskVector.get(key);
+
+            if (otherRiskLevelCount == null) {
+                // Handle the case where the key is not present in the other RiskVector
+                return 1; // or -1, depending on your requirements
+            }
+
+            // Compare RiskLevelCount objects
+            int result = thisRiskLevelCount.compareTo(otherRiskLevelCount);
+            if (result != 0) {
+                return result;
+            }
+        }
+
+        // If all RiskLevelCount objects are equal, consider the RiskVectors equal
+        return 0;
+    }
 }