Commit ab7bbc53 authored by Sergio Pérez's avatar Sergio Pérez
Browse files

Merge remote-tracking branch 'origin/master'

parents 4118cc15 84f7be1e

EDG/src/main/java/edg/DotFactory.java

+1 −7
Original line number Diff line number Diff line
@@ -255,12 +255,6 @@ public class DotFactory { 
					attrs.put("constraint", FALSE);

					attrs.put("style", DASHED);

					break;

				case ValueStructure:

					attrs.put("color", STEELBLUE);

					attrs.put("penwidth", TWO);

					attrs.put("constraint", FALSE);

					attrs.put("style", DASHED);

					break;

				case CallReq:

					attrs.put("color", SKYBLUE);

					attrs.put("penwidth", TWO);

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ release: beams 
	mkdir -p e-knife-$(VERSION)/ebin

	cp e-Knife/target/e-Knife-$(VERSION)-jar-with-dependencies.jar e-knife-$(VERSION)/e-knife.jar

	cd e-knife-$(VERSION)/ebin/ && jar -xf ../e-knife.jar ast.beam ast.erl saver.beam saver.erl

	zip -rq e-knife-$(VERSION){.zip,/}

	zip -rq e-knife-$(VERSION).zip e-knife-$(VERSION)/

	mv e-knife-$(VERSION)/ dist/



.PHONY: clean

e-Knife/src/main/java/eknife/BencherTest.java

+2 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ import java.util.function.Supplier; 
public class BencherTest {



    private static final String TEST_PKG = "bencher";

    private static final String TEST_PKG_INTRA = "bencher_intraprocedural";

    private static final String DOT_ERLANG = ".erl";

    private static final String EDG_CRITERION = ".edg.criterion";

    private static final String EDG_SLICE = ".edg.sliced";
@@ -109,9 +110,8 @@ public class BencherTest { 
    }



    public static void main2(String[] args) {

        TEST_PKG = "bencher_intraprocedural";

        EKnife.printHeadings(EKnife.graphGenerationCsv, EKnife.sliceGenerationCsv);

        File testFolder = new File("./e-knife-v1.1.0-src/e-Knife/src/test/resources/regression/", TEST_PKG);

        File testFolder = new File("./e-knife-v1.1.0-src/e-Knife/src/test/resources/regression/", TEST_PKG_INTRA);

        findFiles(testFolder, DOT_ERLANG, file -> {

            String[] arguments = {"-i", "", "-o" ,"", "-l", "", "-v", ""};

            File outputDir = testFolder.getAbsoluteFile();

e-Knife/src/main/java/eknife/EKnife.java

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ import edg.graph.Node; 
import edg.slicing.*;



import java.io.File;

import java.io.FileWriter;

import java.io.IOException;

import java.io.PrintWriter;

import java.util.HashSet;

import java.util.LinkedList;

import java.util.List;

import java.util.Set;