Java: remove negative models

Author: Jami Cogswell

java/ql/src/Metrics/Summaries/GeneratedVsManualCoverage.ql

@@ -9,7 +9,6 @@
 //import java // not needed I guess
 import semmle.code.java.dataflow.FlowSummary // for SummarizedCallable
 import utils.modelgenerator.internal.CaptureModels // for DataFlowTargetApi
-import semmle.code.java.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl // for NegativeSummarizedCallable
 
 // ! improve QLDoc?
 /**
@@ -20,57 +19,35 @@ import semmle.code.java.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl //
 class MadModeledCallable extends SummarizedCallableBase {
   // ! better name for this class?
   MadModeledCallable() {
-    (
-      this instanceof SummarizedCallable or
-      this instanceof FlowSummaryImpl::Public::NegativeSummarizedCallable
-    ) and
+    this instanceof SummarizedCallable and
     exists(DataFlowTargetApi dataFlowTargApi | this.asCallable() = dataFlowTargApi)
   }
 }
 
 // ! move to other file
-// ! separate this into pos and neg predicates instead of using `posOrNeg` flag?
 /**
  * Returns the number of APIs with MaD models
  * for a given package and provenance.
  */
-float getNumMadModels(string package, string provenance, string posOrNeg) {
+float getNumMadModels(string package, string provenance) {
   exists(MadModeledCallable mc |
     package = mc.asCallable().getDeclaringType().getPackage().toString() and
-    provenance in ["generated", "manual", "both"] and
-    posOrNeg in ["positive", "negative"]
+    provenance in ["generated", "manual", "both"]
   |
-    if posOrNeg = "positive"
-    then
-      result =
-        count(MadModeledCallable c |
-          package = c.asCallable().getDeclaringType().getPackage().toString() and
-          (
-            c.(SummarizedCallable).isAutoGenerated() and // generated and NOT manual = "auto-only"
-            provenance = "generated"
-            or
-            c.(SummarizedCallable).isManuallyGenerated() and // manual and NOT generated = "manual-only"
-            provenance = "manual"
-            or
-            c.(SummarizedCallable).isBothAutoAndManuallyGenerated() and // BOTH generated and manual = "both"
-            provenance = "both"
-          )
-        )
-    else
-      result =
-        count(MadModeledCallable c |
-          package = c.asCallable().getDeclaringType().getPackage().toString() and
-          (
-            c.(FlowSummaryImpl::Public::NegativeSummarizedCallable).isAutoGenerated() and // generated and NOT manual = "auto-only"
-            provenance = "generated"
-            or
-            c.(FlowSummaryImpl::Public::NegativeSummarizedCallable).isManuallyGenerated() and // manual and NOT generated = "manual-only"
-            provenance = "manual"
-            or
-            c.(FlowSummaryImpl::Public::NegativeSummarizedCallable).isBothAutoAndManuallyGenerated() and // BOTH generated and manual = "both"
-            provenance = "both"
-          )
+    result =
+      count(MadModeledCallable c |
+        package = c.asCallable().getDeclaringType().getPackage().toString() and
+        (
+          c.(SummarizedCallable).isAutoGenerated() and // generated and NOT manual = "auto-only"
+          provenance = "generated"
+          or
+          c.(SummarizedCallable).isManuallyGenerated() and // manual and NOT generated = "manual-only"
+          provenance = "manual"
+          or
+          c.(SummarizedCallable).isBothAutoAndManuallyGenerated() and // BOTH generated and manual = "both"
+          provenance = "both"
         )
+      )
   )
 }
 
@@ -86,8 +63,7 @@ float getNumApisWithoutMadModel(string package) {
     result =
       count(DataFlowTargetApi d |
         package = d.getDeclaringType().getPackage().toString() and
-        not exists(SummarizedCallable sc | d = sc.asCallable()) and
-        not exists(FlowSummaryImpl::Public::NegativeSummarizedCallable nc | d = nc.asCallable())
+        not exists(SummarizedCallable sc | d = sc.asCallable())
       )
   )
 }
@@ -106,18 +82,14 @@ float getNumApisWithoutMadModel(string package) {
  */
 
 from
-  string package, float generatedPos, float manualPos, float bothPos, float generatedNeg,
-  float manualNeg, float bothNeg, float notModeled, float all, float metric1, float metric2
+  string package, float generatedPos, float manualPos, float bothPos, float notModeled, float all,
+  float metric1, float metric2
 where
-  generatedPos = getNumMadModels(package, "generated", "positive") and
-  manualPos = getNumMadModels(package, "manual", "positive") and
-  bothPos = getNumMadModels(package, "both", "positive") and
-  generatedNeg = getNumMadModels(package, "generated", "negative") and
-  manualNeg = getNumMadModels(package, "manual", "negative") and
-  bothNeg = getNumMadModels(package, "both", "negative") and
+  generatedPos = getNumMadModels(package, "generated") and
+  manualPos = getNumMadModels(package, "manual") and
+  bothPos = getNumMadModels(package, "both") and
   notModeled = getNumApisWithoutMadModel(package) and
-  all = generatedPos + manualPos + bothPos + generatedNeg + manualNeg + bothNeg + notModeled and
+  all = generatedPos + manualPos + bothPos + notModeled and
   metric1 = (bothPos / (bothPos + manualPos)) and // ! I believe this metric was intended to be only on the positive ones?
-  metric2 = (generatedPos + generatedNeg + bothPos + bothNeg + manualPos + manualNeg) / all
-select package, generatedPos, manualPos, bothPos, generatedNeg, manualNeg, bothNeg, notModeled, all,
-  metric1, metric2 order by package
+  metric2 = (generatedPos + bothPos + manualPos) / all
+select package, generatedPos, manualPos, bothPos, notModeled, all, metric1, metric2 order by package