[AMIE] Options changes:

lazy is now the default mining assistant, using mins without minhc modify the pruning metric used NEW: noSkyline disable the skyline pruning (output)
falcaopetri · Jul 1, 2020 · a2beeca · a2beeca
1 parent 553a844
commit a2beeca
Show file tree

Hide file tree

Showing 3 changed files with 302 additions and 269 deletions.
diff --git a/amie-dev.jar b/amie-dev.jar
diff --git a/mining/src/main/java/amie/mining/AMIE.java b/mining/src/main/java/amie/mining/AMIE.java
@@ -620,7 +620,7 @@ public static AMIE getInstance(String[] args)
          * ******************************
          */
         int nProcessors = Runtime.getRuntime().availableProcessors();
-        String bias = "default"; // Counting support on the two head variables.
+        String bias = "lazy"; // Counting support on the two head variables.
         Metric metric = Metric.HeadCoverage; // Metric used to prune the search space.
         VariableOrder variableOrder = new FunctionalOrder();
         MiningAssistant mineAssistant = null;
@@ -819,6 +819,10 @@ public static AMIE getInstance(String[] args)
                         + "and to optimize the query")
                 .create("noKbExistsDetection");
 
+        Option noSkylineOp = OptionBuilder.withArgName("noSkyline")
+                .withDescription("Disable Skyline pruning of results")
+                .create("noSkyline");
+
         Option variableOrderOp = OptionBuilder.withArgName("variableOrder")
                 .withDescription("Define the order of the variable in counting query among: app, fun (default), ifun")
                 .hasArg()
@@ -883,6 +887,7 @@ public static AMIE getInstance(String[] args)
         options.addOption(noHeuristicsOp);
         options.addOption(noKbRewrite);
         options.addOption(noKbExistsDetection);
+        options.addOption(noSkylineOp);
         options.addOption(variableOrderOp);
         options.addOption(extraFileOp);
         options.addOption(datalogNotationOpt);
@@ -939,6 +944,10 @@ public static AMIE getInstance(String[] args)
             System.exit(1);
         }
 
+        if (cli.hasOption("mins") && cli.hasOption("minhc") && !cli.hasOption("pm")) {
+            System.out.println("Warning: Both -mins and -minhc are set but only the default pruning metric will be used");
+        }
+
         if (cli.hasOption("mins")) {
             String minSupportStr = cli.getOptionValue("mins");
             try {
@@ -975,6 +984,8 @@ public static AMIE getInstance(String[] args)
             }
         }
 
+        minMetricValue = minHeadCover;
+
         if (cli.hasOption("minc")) {
             String minConfidenceStr = cli.getOptionValue("minc");
             try {
@@ -1161,24 +1172,31 @@ public static AMIE getInstance(String[] args)
             schemaSource.load(schemaFiles);
         }
 
+        if (cli.hasOption("mins") != cli.hasOption("minhc")) {
+            if (cli.hasOption("mins")) {
+                    metric = Metric.Support;
+                    minMetricValue = minSup;
+                    if (!cli.hasOption("minis")) { minInitialSup = minSup; }
+            } else {
+                    metric = Metric.HeadCoverage;
+                    minMetricValue = minHeadCover;
+            }
+        }
+
         if (cli.hasOption("pm")) {
             switch (cli.getOptionValue("pm")) {
                 case "support":
                     metric = Metric.Support;
-                    System.err.println("Using " + metric + " as pruning metric with threshold " + minSup);
                     minMetricValue = minSup;
-                    minInitialSup = minSup;
+                    if (!cli.hasOption("minis")) { minInitialSup = minSup; }
                     break;
                 default:
                     metric = Metric.HeadCoverage;
-                    System.err.println("Using " + metric + " as pruning metric with threshold " + minHeadCover);
-                    minMetricValue = minHeadCover;                    
+                    minMetricValue = minHeadCover;
                     break;
             }
-        } else {
-            System.out.println("Using " + metric + " as pruning metric with minimum threshold " + minHeadCover);
-            minMetricValue = minHeadCover;
         }
+        System.out.println("Using " + metric + " as pruning metric with minimum threshold " + minMetricValue);
 
         if (cli.hasOption("bias")) {
             bias = cli.getOptionValue("bias");
@@ -1334,6 +1352,7 @@ public static AMIE getInstance(String[] args)
         mineAssistant.setOmmitStdConfidence(ommitStdConfidence);
         mineAssistant.setDatalogNotation(datalogOutput);
         mineAssistant.setOptimAdaptiveInstantiations(adaptiveInstantiations);
+        mineAssistant.setUseSkylinePruning(!cli.hasOption("noSkyline"));
 
         System.out.println(mineAssistant.getDescription());