diff options
5 files changed, 57 insertions, 7 deletions
diff --git a/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/PDDLtoSAN.java b/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/PDDLtoSAN.java index c1a96f2fa1c..a4d9c179c84 100644 --- a/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/PDDLtoSAN.java +++ b/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/PDDLtoSAN.java @@ -11,7 +11,6 @@ import java.util.Properties; import java.util.Scanner; import Translator.PDDL_Translator; -import Translator.StatisticsCompilation; import Translator.StatisticsReport; import pddl4j.Domain; @@ -115,8 +114,8 @@ public class PDDLtoSAN System.out.println(" SAN number of conditions: "+ n.getConditonNodeCount()); System.out.println(" SAN number of actions: " + n.getActionNodeCount()); - // stat_compl.all_reports.add(n.getStatReport()); - // all_stat_compl.all_reports.add(n.getStatReport()); + stat_compl.all_reports.add(n.getStatReport()); + all_stat_compl.all_reports.add(n.getStatReport()); // n.printSAN(); diff --git a/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/StatisticsCompilation.java b/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/StatisticsCompilation.java new file mode 100644 index 00000000000..64e194d4abb --- /dev/null +++ b/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/StatisticsCompilation.java @@ -0,0 +1,11 @@ +import java.util.ArrayList; +import java.util.List; + +import Translator.StatisticsReport; + + +public class StatisticsCompilation { + + public List<StatisticsReport> all_reports = new ArrayList<StatisticsReport>(); + +} diff --git a/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/Translator/PDDL_Translator.java b/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/Translator/PDDL_Translator.java index 48b8c817d03..68fea62a313 100644 --- a/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/Translator/PDDL_Translator.java +++ b/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/Translator/PDDL_Translator.java @@ -334,12 +334,12 @@ public class PDDL_Translator { for(SimpleNode sn: simple_graph.values()){ double connected = 0; - for(SimpleNode sn_child: sn.neigbors){ - for(SimpleNode sn_child_check: sn.neigbors){ + for(SimpleNode sn_child: sn.neighbors){ + for(SimpleNode sn_child_check: sn.neighbors){ if(sn_child == sn_child_check){ continue; } - if(sn_child.neigbors.contains(sn_child_check)){ + if(sn_child.neighbors.contains(sn_child_check)){ connected++; } } @@ -347,7 +347,7 @@ public class PDDL_Translator { // System.out.println("Connected: "+connected); // System.out.println("Neighbors: "+sn.neigbors.size()); // if(sn.neigbors.size() > 1) - connectednesses.add((connected)/(sn.neigbors.size()*(sn.neigbors.size()-1))); + connectednesses.add((connected)/(sn.neighbors.size()*(sn.neighbors.size()-1))); // System.out.println((connected)/(sn.neigbors.size()*(sn.neigbors.size()-1))); } diff --git a/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/Translator/SimpleNode.java b/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/Translator/SimpleNode.java new file mode 100644 index 00000000000..94f26da454f --- /dev/null +++ b/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/Translator/SimpleNode.java @@ -0,0 +1,22 @@ +package Translator; + +import java.util.HashSet; +import java.util.Set; + +public class SimpleNode { + + public final String tn; + + public final Set<SimpleNode> neighbors = new HashSet<SimpleNode>(); + + public SimpleNode(String tn) { + + this.tn = tn; + } + + public static void connect(SimpleNode simpleNode, SimpleNode simpleNode2) { + simpleNode.neighbors.add(simpleNode2); + simpleNode2.neighbors.add(simpleNode); + } + +} diff --git a/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/Translator/StatisticsReport.java b/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/Translator/StatisticsReport.java new file mode 100644 index 00000000000..8acfe0c5a79 --- /dev/null +++ b/SA_POP/utils/PDDLtoSANetTranslator/PDDLParser/src/Translator/StatisticsReport.java @@ -0,0 +1,18 @@ +package Translator; + +import java.util.Map; + +public class StatisticsReport { + + private final String domainName; + private final String problemName; + public Map<String, InfoSet> reports; + + public StatisticsReport(String domainName, String problemName) { + + this.domainName = domainName; + this.problemName = problemName; + + } + +} |