Commit f74dca41 authored by Jonathan Shahen's avatar Jonathan Shahen

Formatting changes

parent 9cca6ac1
package mohawk.converter.to.asaptime;
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.*;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.*;
import java.util.logging.Logger;
import org.stringtemplate.v4.ST;
......@@ -14,11 +10,7 @@ import org.stringtemplate.v4.ST;
import mohawk.converter.to.ConvertTo;
import mohawk.global.helper.RoleHelper;
import mohawk.global.helper.TimeIntervalHelper;
import mohawk.global.pieces.MohawkT;
import mohawk.global.pieces.Query;
import mohawk.global.pieces.Role;
import mohawk.global.pieces.Rule;
import mohawk.global.pieces.TimeSlot;
import mohawk.global.pieces.*;
import mohawk.global.pieces.reduced.query.ASAPTimeNSA_Query;
import mohawk.global.pieces.reduced.rules.ASAPTimeNSA_Rule;
import mohawk.global.timing.MohawkTiming;
......
package mohawk.converter.to.asaptime;
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.*;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
......@@ -15,11 +11,7 @@ import org.stringtemplate.v4.ST;
import mohawk.converter.to.ConvertTo;
import mohawk.global.helper.RoleHelper;
import mohawk.global.helper.TimeIntervalHelper;
import mohawk.global.pieces.MohawkT;
import mohawk.global.pieces.Query;
import mohawk.global.pieces.Role;
import mohawk.global.pieces.Rule;
import mohawk.global.pieces.TimeSlot;
import mohawk.global.pieces.*;
import mohawk.global.pieces.reduced.query.ASAPTimeSA_Query;
import mohawk.global.pieces.reduced.rules.ASAPTimeSA_Rule;
import mohawk.global.timing.MohawkTiming;
......@@ -217,7 +209,7 @@ public class ConvertToASAPTimeSA extends ConvertTo {
}
// Convert Preconditions to the Role Indexes
//System.out.println("[toASAPTimeSA_Rules] Rule: " + rule);
// System.out.println("[toASAPTimeSA_Rules] Rule: " + rule);
Integer id;
for (Role r : rule._preconditions) {
id = roleHelper.indexOf(r);
......
......@@ -52,7 +52,6 @@ public class ConvertToMohawk extends ConvertTo {
workableRules = roleHelper.removeEnableDisableRulesv2(m.getAllRules());
break;
}
// (3)
/* Timing */timing.stopTimer(tPrefix + "_removeEnableDisableRules");
......
package mohawk.converter.to.tred;
import java.io.BufferedWriter;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.*;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Paths;
......@@ -18,12 +14,7 @@ import org.stringtemplate.v4.ST;
import mohawk.converter.to.ConvertTo;
import mohawk.global.helper.RoleHelper;
import mohawk.global.helper.TimeIntervalHelper;
import mohawk.global.pieces.MohawkT;
import mohawk.global.pieces.Query;
import mohawk.global.pieces.Role;
import mohawk.global.pieces.Rule;
import mohawk.global.pieces.RuleType;
import mohawk.global.pieces.TimeSlot;
import mohawk.global.pieces.*;
import mohawk.global.pieces.reduced.query.TRole_Query;
import mohawk.global.pieces.reduced.rules.TRole_Rule;
import mohawk.global.timing.MohawkTiming;
......@@ -107,7 +98,7 @@ public class ConvertToTRole extends ConvertTo {
writer.write(header);
// Convert Rules into Reduced ASAPTime NSA Rules
for (Rule r : workableRules) {
//newRules.add(new TRole_Rule(r, roleHelper, timeIntervalHelper));
// newRules.add(new TRole_Rule(r, roleHelper, timeIntervalHelper));
writer.write(new TRole_Rule(r, roleHelper, timeIntervalHelper).getString());
}
} catch (IOException x) {
......@@ -122,7 +113,7 @@ public class ConvertToTRole extends ConvertTo {
// Convert Rules into Reduced ASAPTime NSA Rules
for (Rule r : workableRules) {
//newRules.add(new TRole_Rule(r, roleHelper, timeIntervalHelper));
// newRules.add(new TRole_Rule(r, roleHelper, timeIntervalHelper));
sb.append(new TRole_Rule(r, roleHelper, timeIntervalHelper).getString());
}
convertedStr = sb.toString();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment