Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,5 @@ xtend-gen/
tests/dev.arcovia.mitigation.sat.tests/testresults/*.json
tests/dev.arcovia.mitigation.sat.tests/efficencyTest/*.json
!*literalMapping.json
tests/dev.arcovia.mitigation.utils.tests/testresults/scaledTFGAmount.json
*.json
28 changes: 28 additions & 0 deletions bundles/dev.arcovia.mitigation.ilp/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>dev.arcovia.mitigation.ilp</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
3 changes: 1 addition & 2 deletions bundles/dev.arcovia.mitigation.sat/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ Bundle-Name: Sat
Bundle-SymbolicName: dev.arcovia.mitigation.sat
Bundle-Version: 1.0.0.qualifier
Export-Package:
dev.arcovia.mitigation.sat,
dev.arcovia.mitigation.sat.dsl
dev.arcovia.mitigation.sat
Require-Bundle:
org.sat4j.core;bundle-version="2.3.6",
org.dataflowanalysis.converter,
Expand Down
7 changes: 7 additions & 0 deletions bundles/dev.arcovia.mitigation.utils/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
28 changes: 28 additions & 0 deletions bundles/dev.arcovia.mitigation.utils/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>dev.arcovia.mitigation.utils</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
15 changes: 15 additions & 0 deletions bundles/dev.arcovia.mitigation.utils/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Utils
Bundle-SymbolicName: dev.arcovia.mitigation.utils
Bundle-Version: 1.0.0.qualifier
Automatic-Module-Name: dev.arcovia.mitigation.utils
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: dev.arcovia.mitigation.utils.dsl,
dev.arcovia.mitigation.utils.scaler
Require-Bundle: dev.arcovia.mitigation.sat;bundle-version="1.0.0",
org.dataflowanalysis.analysis;bundle-version="4.0.0",
org.dataflowanalysis.converter;bundle-version="4.0.0",
org.dataflowanalysis.analysis.dfd;bundle-version="4.0.0",
org.dataflowanalysis.dfd.datadictionary;bundle-version="4.0.0",
org.dataflowanalysis.dfd.dataflowdiagram;bundle-version="4.0.0"
4 changes: 4 additions & 0 deletions bundles/dev.arcovia.mitigation.utils/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package dev.arcovia.mitigation.sat.dsl;
package dev.arcovia.mitigation.utils.dsl;

import dev.arcovia.mitigation.sat.Constraint;
import dev.arcovia.mitigation.sat.Literal;
import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.sat.dsl.nodes.ConjunctionNode;
import dev.arcovia.mitigation.sat.dsl.nodes.DisjunctionNode;
import dev.arcovia.mitigation.sat.dsl.nodes.LiteralNode;
import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.nodes.ConjunctionNode;
import dev.arcovia.mitigation.utils.dsl.nodes.DisjunctionNode;
import dev.arcovia.mitigation.utils.dsl.nodes.LiteralNode;

import java.util.ArrayList;
import java.util.Collections;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package dev.arcovia.mitigation.sat.dsl;
package dev.arcovia.mitigation.utils.dsl;

import java.util.*;

import dev.arcovia.mitigation.sat.*;
import dev.arcovia.mitigation.sat.dsl.selectors.conditional.DynamicConditionalSelector;
import dev.arcovia.mitigation.sat.dsl.selectors.conditional.DynamicEmptySetOperationConditionalSelector;
import dev.arcovia.mitigation.sat.dsl.selectors.conditional.DynamicVariableConditionalSelector;
import dev.arcovia.mitigation.sat.dsl.selectors.constant.*;
import dev.arcovia.mitigation.sat.dsl.selectors.dynamic.DynamicDataCharacteristicSelector;
import dev.arcovia.mitigation.sat.dsl.selectors.dynamic.DynamicDataSelector;
import dev.arcovia.mitigation.sat.dsl.selectors.dynamic.DynamicVertexCharacteristicSelector;
import dev.arcovia.mitigation.utils.dsl.selectors.conditional.DynamicConditionalSelector;
import dev.arcovia.mitigation.utils.dsl.selectors.conditional.DynamicEmptySetOperationConditionalSelector;
import dev.arcovia.mitigation.utils.dsl.selectors.conditional.DynamicVariableConditionalSelector;
import dev.arcovia.mitigation.utils.dsl.selectors.constant.*;
import dev.arcovia.mitigation.utils.dsl.selectors.dynamic.DynamicDataCharacteristicSelector;
import dev.arcovia.mitigation.utils.dsl.selectors.dynamic.DynamicDataSelector;
import dev.arcovia.mitigation.utils.dsl.selectors.dynamic.DynamicVertexCharacteristicSelector;

import org.dataflowanalysis.analysis.dsl.AnalysisConstraint;
import org.dataflowanalysis.analysis.dsl.selectors.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.arcovia.mitigation.sat.dsl.nodes;
package dev.arcovia.mitigation.utils.dsl.nodes;

/**
* Represents a logical branch node in a formula tree, such as a conjunction or disjunction node.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.arcovia.mitigation.sat.dsl.nodes;
package dev.arcovia.mitigation.utils.dsl.nodes;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.arcovia.mitigation.sat.dsl.nodes;
package dev.arcovia.mitigation.utils.dsl.nodes;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.arcovia.mitigation.sat.dsl.nodes;
package dev.arcovia.mitigation.utils.dsl.nodes;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.arcovia.mitigation.sat.dsl.nodes;
package dev.arcovia.mitigation.utils.dsl.nodes;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.arcovia.mitigation.sat.dsl.selectors.conditional;
package dev.arcovia.mitigation.utils.dsl.selectors.conditional;

import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.sat.dsl.selectors.dynamic.DynamicDataSelector;
import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.selectors.dynamic.DynamicDataSelector;

import java.util.List;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package dev.arcovia.mitigation.sat.dsl.selectors.conditional;
package dev.arcovia.mitigation.utils.dsl.selectors.conditional;

import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.selectors.dynamic.DynamicDataSelector;

import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.sat.dsl.selectors.dynamic.DynamicDataSelector;
import org.dataflowanalysis.analysis.dsl.selectors.EmptySetOperationConditionalSelector;
import org.dataflowanalysis.analysis.dsl.selectors.Intersection;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package dev.arcovia.mitigation.sat.dsl.selectors.conditional;
package dev.arcovia.mitigation.utils.dsl.selectors.conditional;

import dev.arcovia.mitigation.sat.IncomingDataLabel;
import dev.arcovia.mitigation.sat.Label;
import dev.arcovia.mitigation.sat.NodeLabel;
import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.sat.dsl.nodes.ConjunctionNode;
import dev.arcovia.mitigation.sat.dsl.nodes.DisjunctionNode;
import dev.arcovia.mitigation.sat.dsl.nodes.LiteralNode;
import dev.arcovia.mitigation.sat.dsl.selectors.dynamic.DynamicDataCharacteristicSelector;
import dev.arcovia.mitigation.sat.dsl.selectors.dynamic.DynamicDataSelector;
import dev.arcovia.mitigation.sat.dsl.selectors.dynamic.DynamicVertexCharacteristicSelector;
import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.nodes.ConjunctionNode;
import dev.arcovia.mitigation.utils.dsl.nodes.DisjunctionNode;
import dev.arcovia.mitigation.utils.dsl.nodes.LiteralNode;
import dev.arcovia.mitigation.utils.dsl.selectors.dynamic.DynamicDataCharacteristicSelector;
import dev.arcovia.mitigation.utils.dsl.selectors.dynamic.DynamicDataSelector;
import dev.arcovia.mitigation.utils.dsl.selectors.dynamic.DynamicVertexCharacteristicSelector;

import org.dataflowanalysis.analysis.dsl.selectors.Intersection;

import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.arcovia.mitigation.sat.dsl.selectors.conditional;
package dev.arcovia.mitigation.utils.dsl.selectors.conditional;

import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.sat.dsl.selectors.dynamic.DynamicDataSelector;
import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.selectors.dynamic.DynamicDataSelector;

import java.util.List;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package dev.arcovia.mitigation.sat.dsl.selectors.conditional;
package dev.arcovia.mitigation.utils.dsl.selectors.conditional;

import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.selectors.dynamic.DynamicDataSelector;

import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.sat.dsl.selectors.dynamic.DynamicDataSelector;
import org.dataflowanalysis.analysis.dsl.selectors.VariableConditionalSelector;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package dev.arcovia.mitigation.sat.dsl.selectors.constant;
package dev.arcovia.mitigation.utils.dsl.selectors.constant;

import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.sat.dsl.nodes.ConjunctionNode;
import dev.arcovia.mitigation.sat.dsl.nodes.DisjunctionNode;
import org.dataflowanalysis.analysis.dsl.selectors.DataCharacteristicListSelector;
import org.dataflowanalysis.analysis.dsl.selectors.DataCharacteristicsSelector;

import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.nodes.ConjunctionNode;
import dev.arcovia.mitigation.utils.dsl.nodes.DisjunctionNode;

/**
* Wraps a {@link DataCharacteristicListSelector} to add constant data characteristic literals to a {@link BranchNode}.
* Handles inversion by creating conjunction or disjunction nodes and recursively adding literals for each data
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package dev.arcovia.mitigation.sat.dsl.selectors.constant;
package dev.arcovia.mitigation.utils.dsl.selectors.constant;

import dev.arcovia.mitigation.sat.IncomingDataLabel;
import dev.arcovia.mitigation.sat.Label;
import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.sat.dsl.nodes.LiteralNode;
import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.nodes.LiteralNode;

import org.dataflowanalysis.analysis.dsl.selectors.DataCharacteristicsSelector;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.arcovia.mitigation.sat.dsl.selectors.constant;
package dev.arcovia.mitigation.utils.dsl.selectors.constant;

import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;

/**
* Represents a selector that adds constant data literals to a logical formula tree.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package dev.arcovia.mitigation.sat.dsl.selectors.constant;
package dev.arcovia.mitigation.utils.dsl.selectors.constant;

import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.sat.dsl.nodes.ConjunctionNode;
import dev.arcovia.mitigation.sat.dsl.nodes.DisjunctionNode;
import org.dataflowanalysis.analysis.dsl.selectors.VertexCharacteristicsListSelector;
import org.dataflowanalysis.analysis.dsl.selectors.VertexCharacteristicsSelector;

import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.nodes.ConjunctionNode;
import dev.arcovia.mitigation.utils.dsl.nodes.DisjunctionNode;

/**
* Wraps a {@link VertexCharacteristicsListSelector} to add constant vertex characteristic literals to a
* {@link BranchNode}. Handles inversion by creating conjunction or disjunction nodes and recursively adding literals
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package dev.arcovia.mitigation.sat.dsl.selectors.constant;
package dev.arcovia.mitigation.utils.dsl.selectors.constant;

import dev.arcovia.mitigation.sat.Label;
import dev.arcovia.mitigation.sat.NodeLabel;
import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.sat.dsl.nodes.LiteralNode;
import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.nodes.LiteralNode;

import org.dataflowanalysis.analysis.dsl.selectors.VertexCharacteristicsSelector;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package dev.arcovia.mitigation.sat.dsl.selectors.dynamic;
package dev.arcovia.mitigation.utils.dsl.selectors.dynamic;

import dev.arcovia.mitigation.sat.Label;
import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.sat.dsl.selectors.constant.ConstantDataCharacteristicListSelector;
import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.selectors.constant.ConstantDataCharacteristicListSelector;

import org.dataflowanalysis.analysis.dsl.selectors.CharacteristicsSelectorData;
import org.dataflowanalysis.analysis.dsl.selectors.DataCharacteristicListSelector;
import org.dataflowanalysis.analysis.dsl.selectors.DataCharacteristicsSelector;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.arcovia.mitigation.sat.dsl.selectors.dynamic;
package dev.arcovia.mitigation.utils.dsl.selectors.dynamic;

import dev.arcovia.mitigation.sat.Label;
import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;

import java.util.List;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package dev.arcovia.mitigation.sat.dsl.selectors.dynamic;
package dev.arcovia.mitigation.utils.dsl.selectors.dynamic;

import dev.arcovia.mitigation.sat.Label;
import dev.arcovia.mitigation.sat.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.sat.dsl.selectors.constant.ConstantVertexCharacteristicListSelector;
import dev.arcovia.mitigation.utils.dsl.nodes.BranchNode;
import dev.arcovia.mitigation.utils.dsl.selectors.constant.ConstantVertexCharacteristicListSelector;

import org.dataflowanalysis.analysis.dsl.selectors.CharacteristicsSelectorData;
import org.dataflowanalysis.analysis.dsl.selectors.VertexCharacteristicsListSelector;
import org.dataflowanalysis.analysis.dsl.selectors.VertexCharacteristicsSelector;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.arcovia.mitigation.sat;
package dev.arcovia.mitigation.utils.scaler;

import java.util.HashMap;
import java.util.Map;
Expand Down
28 changes: 28 additions & 0 deletions tests/dev.arcovia.mitigation.ilp.tests/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>dev.arcovia.mitigation.ilp.tests</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>
Loading