Commit 77b182b8 authored by Carlos Galindo's avatar Carlos Galindo
Browse files

Merge branch 'JSS_rainbow' into 'master' 

Add missing commits that weren't pushed for previous merge

See merge request program-slicing/e-knife-erlang!2
parents 76b73488 6481b38d

EDG/src/main/java/edg/slicing/AdaptedStandardAlgorithm.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -20,12 +20,12 @@ public class AdaptedStandardAlgorithm extends StandardAlgorithm{ 
            return slice;

            return slice;





        slice.add(slicingCriterion);

        slice.add(slicingCriterion);

        this.traverse(slicingCriterion, slice);

        this.traverse(Phase.OnePhase,slicingCriterion, slice);





        return slice;

        return slice;

    }

    }





    protected void traverse(Node slicingCriterion, Set<Node> slice, Edge.Type... ignoreEdgeTypes) {

    protected void traverse(Phase phase, Node slicingCriterion, Set<Node> slice, Edge.Type... ignoreEdgeTypes) {

        final Deque<SliceState> pendingNodes = new LinkedList<>();

        final Deque<SliceState> pendingNodes = new LinkedList<>();





        for (Node n : slice)

        for (Node n : slice)
@@ -47,6 +47,10 @@ public class AdaptedStandardAlgorithm extends StandardAlgorithm{ 




            for (Edge nextEdge : nextEdges)

            for (Edge nextEdge : nextEdges)

            {

            {

                if(phase == Phase.SummaryGeneration &&

                        (nextEdge.getType() == Edge.Type.Input || nextEdge.getType() == Edge.Type.Output))

                    continue;



                final Node nextNode = sliceDirection == LAST.Direction.Backwards ?

                final Node nextNode = sliceDirection == LAST.Direction.Backwards ?

                        edg.getEdgeSource(nextEdge): edg.getEdgeTarget(nextEdge);

                        edg.getEdgeSource(nextEdge): edg.getEdgeTarget(nextEdge);

                if (!slice.contains(nextNode))

                if (!slice.contains(nextNode))