Enabled Parallelization code and commented out non-parallel code and

fixed a few typos

jOptJSRecover/src/jopt/js/spi/domain/resource/DiscreteResourceDomain.java

@@ -207,7 +207,7 @@ public class DiscreteResourceDomain extends ResourceDomain {
             }
         }
 
-        int maxValue = 0;
+/*        int maxValue = 0;
         for (int i=0; i<indices.size(); i++) {
             index = indices.get(i);
             int val = worthes.get(i);
@@ -236,9 +236,9 @@ public class DiscreteResourceDomain extends ResourceDomain {
                 }
             }
         }
-
+        */
 
- /*// Modified code for adding in parallel capabilities
+ // Modified code for adding in parallel capabilities
 
 
 
@@ -306,7 +306,7 @@ public class DiscreteResourceDomain extends ResourceDomain {
         }
 
   // End Parallelization       
-  */
+
 
 
         return maxValue;    

jOptJSRecover/src/jopt/js/spi/graph/arc/ForwardCheckArc.java

@@ -37,7 +37,7 @@ public class ForwardCheckArc extends SchedulerArc {
 		}
 		Arrays.sort(targetIDs);
 		this.targets = new ResourceNode[targets.length];
-
+/*		
 		//(Non-parallel implementation) This will ensure that resources are ordered for fast easy access later
 			for (int i=0; i<targetIDs.length; i++) {
 				for (int j=0; j<targets.length; j++) {
@@ -46,19 +46,19 @@ public class ForwardCheckArc extends SchedulerArc {
 						break;
 					}
 				}
-			}
+			}*/
 
 
 		 // Parallelization implementation Begins
 		 // - Creates an object that will split the task of the above code into separate tasks.
 
 
 
-/*		ForkSplit target_loop = new ForkSplit(0, targetIDs.length,targets,targetIDs,this.targets);
+		ForkSplit target_loop = new ForkSplit(0, targetIDs.length,targets,targetIDs,this.targets);
 		ForkJoinPool target_pool = new ForkJoinPool();
 		target_pool.invoke(target_loop);
-		this.targets = target_loop.get_main_targets(); // Will grab the targets object from forking
-		*/
+		this.targets = target_loop.get_main_vars(); // Will grab the targets object from forking
+
 
 		 // Parallelization implementation End
 

jOptJSRecover/src/jopt/js/spi/graph/arc/ForwardCheckReflexArc.java

@@ -37,7 +37,7 @@ public class ForwardCheckReflexArc extends SchedulerArc {
         Arrays.sort(sourceIDs);
         this.sources= new ResourceNode[sources.length];
 
-        //(Non-parallel implementation) This will ensure that resources are ordered for fast and easy access later
+/*        //(Non-parallel implementation) This will ensure that resources are ordered for fast and easy access later
 	        for (int i=0; i<sourceIDs.length; i++) {
 	        	for (int j=0; j<sources.length; j++) {
 	        		if (sourceIDs[i] == sources[j].getID()) {
@@ -46,17 +46,17 @@ public class ForwardCheckReflexArc extends SchedulerArc {
 	        		}
 	        	}
 	        } 
-
+        */
 
          // Parallelization implementation
 	     // - Creates an object that will split the task of the above code into separate tasks.
 
 
-/*	        ForkSplit source_loop = new ForkSplit(0,sourceIDs.length,sources,sourceIDs, this.sources);
+	        ForkSplit source_loop = new ForkSplit(0,sourceIDs.length,sources,sourceIDs, this.sources);
 	        ForkJoinPool source_pool = new ForkJoinPool();
 	        source_pool.invoke(source_loop);
-	        this.sources = source_loop.get_main_targets();
-	        */
+	        this.sources = source_loop.get_main_vars();
+
 
          // Parallelization end
 

jOptJSRecover/src/jopt/js/spi/variable/JsVarFactory.java

@@ -115,7 +115,7 @@ public class JsVarFactory extends VarFactory implements JsVariableFactory {
 
 		int index = offset;
 
-	// (Non - Parallel Implementation) //
+/*	// (Non - Parallel Implementation) //
 		for (int i=1; i<capacity.length; i++) {
 			for (int j=0; j<4; j++) {
 				if (index<neoCapacity.length) {
@@ -125,18 +125,18 @@ public class JsVarFactory extends VarFactory implements JsVariableFactory {
 			}
 		}
 		
-
+		*/
 
 
 		 // Parrallelization Process
 
-/*		 
+
 		ForkSplit_NeoCap neocap_loop = new ForkSplit_NeoCap(index, index + 4*(capacity.length-1),
 															neoCapacity,capacity,1,capacity.length);
 		ForkJoinPool neocap_join = new ForkJoinPool();
 		neocap_join.invoke(neocap_loop);
 
-		*/
+
 		 // End Parrallelization Process