Fix compile errors caused by merge (rebase)

Author: min-guk

src/main/java/org/apache/sysds/hops/fedplanner/FederatedMemoTable.java

@@ -41,8 +41,6 @@ public class FederatedMemoTable {
 	// Maps Hop ID and fedOutType pairs to their plan variants
 	private final Map<Pair<Long, FederatedOutput>, FedPlanVariants> hopMemoTable = new HashMap<>();
 
-	public void addFedPlanVariants(long hopID, FederatedOutput fedOutType, FedPlanVariants fedPlanVariants) {
-		hopMemoTable.put(new ImmutablePair<>(hopID, fedOutType), fedPlanVariants);
 	public void addFedPlanVariants(long hopID, FederatedOutput fedOutType, FedPlanVariants fedPlanVariants) {
 		hopMemoTable.put(new ImmutablePair<>(hopID, fedOutType), fedPlanVariants);
 	}
@@ -136,15 +134,12 @@ public static class FedPlanVariants {
 		private final FederatedOutput fedOutType;  // Output type (FOUT/LOUT)
 		protected List<FedPlan> _fedPlanVariants;  // List of plan variants
 
-		public FedPlanVariants(HopCommon hopCommon, FederatedOutput fedOutType) {
-			this.hopCommon = hopCommon;
 		public FedPlanVariants(HopCommon hopCommon, FederatedOutput fedOutType) {
 			this.hopCommon = hopCommon;
 			this.fedOutType = fedOutType;
 			this._fedPlanVariants = new ArrayList<>();
 		}
 
-		public boolean isEmpty() {return _fedPlanVariants.isEmpty();}
 		public boolean isEmpty() {return _fedPlanVariants.isEmpty();}
 		public void addFedPlan(FedPlan fedPlan) {_fedPlanVariants.add(fedPlan);}
 		public List<FedPlan> getFedPlanVariants() {return _fedPlanVariants;}
@@ -154,7 +149,6 @@ public boolean pruneFedPlans() {
 			if (!_fedPlanVariants.isEmpty()) {
 				// Find the FedPlan with the minimum cumulative cost
 				FedPlan minCostPlan = _fedPlanVariants.stream()
-						.min(Comparator.comparingDouble(FedPlan::getCumulativeCost))
 						.min(Comparator.comparingDouble(FedPlan::getCumulativeCost))
 						.orElse(null);
 

src/main/java/org/apache/sysds/hops/fedplanner/FederatedMemoTablePrinter.java

@@ -169,7 +169,7 @@ private static void printFedPlan(FederatedMemoTable.FedPlan plan, int depth, boo
 				plan.getCumulativeCost(),
 				plan.getSelfCost(),
 				plan.getForwardingCost(),
-				plan.getWeight()));
+				plan.getComputeWeight()));
 
 		// Add matrix characteristics
 		sb.append(" [")

src/main/java/org/apache/sysds/runtime/instructions/FEDInstructionParser.java

@@ -19,6 +19,8 @@
 
 package org.apache.sysds.runtime.instructions;
 
+import java.util.HashMap;
+
 import org.apache.sysds.common.InstructionType;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.instructions.fed.AggregateBinaryFEDInstruction;
@@ -29,13 +31,17 @@
 import org.apache.sysds.runtime.instructions.fed.CentralMomentFEDInstruction;
 import org.apache.sysds.runtime.instructions.fed.CovarianceFEDInstruction;
 import org.apache.sysds.runtime.instructions.fed.FEDInstruction;
+import org.apache.sysds.runtime.instructions.fed.FEDInstruction.FEDType;
 import org.apache.sysds.runtime.instructions.fed.IndexingFEDInstruction;
 import org.apache.sysds.runtime.instructions.fed.InitFEDInstruction;
 import org.apache.sysds.runtime.instructions.fed.QuantilePickFEDInstruction;
 import org.apache.sysds.runtime.instructions.fed.QuantileSortFEDInstruction;
 import org.apache.sysds.runtime.instructions.fed.ReorgFEDInstruction;
 import org.apache.sysds.runtime.instructions.fed.TernaryFEDInstruction;
 import org.apache.sysds.runtime.instructions.fed.TsmmFEDInstruction;
+import org.apache.sysds.lops.RightIndex;
+import org.apache.sysds.lops.LeftIndex;
+import org.apache.sysds.lops.Append;
 
 public class FEDInstructionParser extends InstructionParser
 {