Skip to content

Commit

Permalink
license headers, cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexandernutz
alexandernutz committed Oct 6, 2017
1 parent d57f190 commit b78bad2
Show file tree
Hide file tree
Showing 8 changed files with 183 additions and 113 deletions.
26 changes: 26 additions & 0 deletions ...e/plugins/analysis/abstractinterpretationv2/domain/transformula/vp/VPDomainBenchmark.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
/*
* Copyright (C) 2017 Alexander Nutz ([email protected])
* Copyright (C) 2017 University of Freiburg
*
* This file is part of the ULTIMATE AbstractInterpretationV2 plug-in.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the ULTIMATE AbstractInterpretationV2 plug-in. If not, see <http://www.gnu.org/licenses/>.
*
* Additional permission under GNU GPL version 3 section 7:
* If you modify the ULTIMATE AbstractInterpretationV2 plug-in, or any covered work, by linking
* or combining it with Eclipse RCP (or a modified version of Eclipse RCP),
* containing parts covered by the terms of the Eclipse Public License, the
* licensors of the ULTIMATE AbstractInterpretationV2 plug-in grant you additional permission
* to convey the resulting work.
*/
package de.uni_freiburg.informatik.ultimate.plugins.analysis.abstractinterpretationv2.domain.transformula.vp;

import java.util.ArrayList;
Expand Down
26 changes: 26 additions & 0 deletions ...timate/plugins/analysis/abstractinterpretationv2/domain/transformula/vp/VPStatistics.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
/*
* Copyright (C) 2017 Alexander Nutz ([email protected])
* Copyright (C) 2017 University of Freiburg
*
* This file is part of the ULTIMATE AbstractInterpretationV2 plug-in.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the ULTIMATE AbstractInterpretationV2 plug-in. If not, see <http://www.gnu.org/licenses/>.
*
* Additional permission under GNU GPL version 3 section 7:
* If you modify the ULTIMATE AbstractInterpretationV2 plug-in, or any covered work, by linking
* or combining it with Eclipse RCP (or a modified version of Eclipse RCP),
* containing parts covered by the terms of the Eclipse Public License, the
* licensors of the ULTIMATE AbstractInterpretationV2 plug-in grant you additional permission
* to convey the resulting work.
*/
package de.uni_freiburg.informatik.ultimate.plugins.analysis.abstractinterpretationv2.domain.transformula.vp;

import java.util.function.BinaryOperator;
Expand Down
26 changes: 26 additions & 0 deletions ...tractinterpretationv2/domain/transformula/vp/elements/AbstractNodeAndFunctionFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
/*
* Copyright (C) 2017 Alexander Nutz ([email protected])
* Copyright (C) 2017 University of Freiburg
*
* This file is part of the ULTIMATE AbstractInterpretationV2 plug-in.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the ULTIMATE AbstractInterpretationV2 plug-in. If not, see <http://www.gnu.org/licenses/>.
*
* Additional permission under GNU GPL version 3 section 7:
* If you modify the ULTIMATE AbstractInterpretationV2 plug-in, or any covered work, by linking
* or combining it with Eclipse RCP (or a modified version of Eclipse RCP),
* containing parts covered by the terms of the Eclipse Public License, the
* licensors of the ULTIMATE AbstractInterpretationV2 plug-in grant you additional permission
* to convey the resulting work.
*/
package de.uni_freiburg.informatik.ultimate.plugins.analysis.abstractinterpretationv2.domain.transformula.vp.elements;

import de.uni_freiburg.informatik.ultimate.plugins.analysis.abstractinterpretationv2.domain.transformula.vp.IEqNodeIdentifier;
Expand Down
88 changes: 0 additions & 88 deletions ...plugins/analysis/abstractinterpretationv2/domain/transformula/vp/elements/EqFunction.java
View file

This file was deleted.

26 changes: 26 additions & 0 deletions ...lugins/analysis/abstractinterpretationv2/domain/transformula/vp/states/FloydWarshall.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
/*
* Copyright (C) 2017 Alexander Nutz ([email protected])
* Copyright (C) 2017 University of Freiburg
*
* This file is part of the ULTIMATE AbstractInterpretationV2 plug-in.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the ULTIMATE AbstractInterpretationV2 plug-in. If not, see <http://www.gnu.org/licenses/>.
*
* Additional permission under GNU GPL version 3 section 7:
* If you modify the ULTIMATE AbstractInterpretationV2 plug-in, or any covered work, by linking
* or combining it with Eclipse RCP (or a modified version of Eclipse RCP),
* containing parts covered by the terms of the Eclipse Public License, the
* licensors of the ULTIMATE AbstractInterpretationV2 plug-in grant you additional permission
* to convey the resulting work.
*/
package de.uni_freiburg.informatik.ultimate.plugins.analysis.abstractinterpretationv2.domain.transformula.vp.states;

import java.util.ArrayList;
Expand Down
26 changes: 26 additions & 0 deletions ...ugins/analysis/abstractinterpretationv2/domain/transformula/vp/states/LiteralManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
/*
* Copyright (C) 2017 Alexander Nutz ([email protected])
* Copyright (C) 2017 University of Freiburg
*
* This file is part of the ULTIMATE AbstractInterpretationV2 plug-in.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the ULTIMATE AbstractInterpretationV2 plug-in. If not, see <http://www.gnu.org/licenses/>.
*
* Additional permission under GNU GPL version 3 section 7:
* If you modify the ULTIMATE AbstractInterpretationV2 plug-in, or any covered work, by linking
* or combining it with Eclipse RCP (or a modified version of Eclipse RCP),
* containing parts covered by the terms of the Eclipse Public License, the
* licensors of the ULTIMATE AbstractInterpretationV2 plug-in grant you additional permission
* to convey the resulting work.
*/
package de.uni_freiburg.informatik.ultimate.plugins.analysis.abstractinterpretationv2.domain.transformula.vp.states;

import java.util.Collection;
Expand Down
26 changes: 26 additions & 0 deletions ...analysis/abstractinterpretationv2/domain/transformula/vp/states/WeakEquivalenceGraph.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
/*
* Copyright (C) 2017 Alexander Nutz ([email protected])
* Copyright (C) 2017 University of Freiburg
*
* This file is part of the ULTIMATE AbstractInterpretationV2 plug-in.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the ULTIMATE AbstractInterpretationV2 plug-in. If not, see <http://www.gnu.org/licenses/>.
*
* Additional permission under GNU GPL version 3 section 7:
* If you modify the ULTIMATE AbstractInterpretationV2 plug-in, or any covered work, by linking
* or combining it with Eclipse RCP (or a modified version of Eclipse RCP),
* containing parts covered by the terms of the Eclipse Public License, the
* licensors of the ULTIMATE AbstractInterpretationV2 plug-in grant you additional permission
* to convey the resulting work.
*/
package de.uni_freiburg.informatik.ultimate.plugins.analysis.abstractinterpretationv2.domain.transformula.vp.states;

import java.util.ArrayList;
Expand Down
52 changes: 27 additions & 25 deletions ...analysis/abstractinterpretationv2/domain/transformula/vp/states/WeqCongruenceClosure.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
/*
* Copyright (C) 2017 Alexander Nutz ([email protected])
* Copyright (C) 2017 University of Freiburg
*
* This file is part of the ULTIMATE AbstractInterpretationV2 plug-in.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The ULTIMATE AbstractInterpretationV2 plug-in is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the ULTIMATE AbstractInterpretationV2 plug-in. If not, see <http://www.gnu.org/licenses/>.
*
* Additional permission under GNU GPL version 3 section 7:
* If you modify the ULTIMATE AbstractInterpretationV2 plug-in, or any covered work, by linking
* or combining it with Eclipse RCP (or a modified version of Eclipse RCP),
* containing parts covered by the terms of the Eclipse Public License, the
* licensors of the ULTIMATE AbstractInterpretationV2 plug-in grant you additional permission
* to convey the resulting work.
*/
package de.uni_freiburg.informatik.ultimate.plugins.analysis.abstractinterpretationv2.domain.transformula.vp.states;

import java.util.ArrayList;
Expand Down Expand Up @@ -33,9 +59,6 @@ public class WeqCongruenceClosure<ACTION extends IIcfgTransition<IcfgLocation>,
private final WeakEquivalenceGraph<ACTION, NODE> mWeakEquivalenceGraph;
private final EqConstraintFactory<ACTION, NODE> mFactory;

// private final LiteralManager<NODE> mLiteralManager;
// private final Collection<NODE> mAllLiterals;

private final HashRelation<Object, NODE> mNodeToDependents;

/**
Expand All @@ -48,8 +71,6 @@ public WeqCongruenceClosure(final EqConstraintFactory<ACTION, NODE> factory) {
assert factory != null;
mWeakEquivalenceGraph = new WeakEquivalenceGraph<>(this, factory);
mFactory = factory;
// mLiteralManager = mFactory.getLiteralManager();
// mAllLiterals = new HashSet<>();
mNodeToDependents = new HashRelation<>();
assert sanityCheck();
}
Expand All @@ -66,8 +87,6 @@ public WeqCongruenceClosure(final boolean isInconsistent) {
}
mWeakEquivalenceGraph = null;
mFactory = null;
// mLiteralManager = null;
// mAllLiterals = null;
mNodeToDependents = null;
}

Expand All @@ -84,10 +103,6 @@ public WeqCongruenceClosure(final CongruenceClosure<NODE> original,
assert factory != null;
mWeakEquivalenceGraph = new WeakEquivalenceGraph<>(this, factory);
mFactory = factory;
// mLiteralManager = mFactory.getLiteralManager();
// mAllLiterals = original.getAllElementRepresentatives().stream().filter(elem -> mLiteralManager.isLiteral(elem))
// .collect(Collectors.toCollection(HashSet::new));

mNodeToDependents = new HashRelation<>();
initializeNodeToDependents(original);
assert sanityCheck();
Expand Down Expand Up @@ -126,9 +141,7 @@ public WeqCongruenceClosure(final WeqCongruenceClosure<ACTION, NODE> original) {
super(original);
assert original.mFactory != null;
mFactory = original.mFactory;
// mLiteralManager = mFactory.getLiteralManager();
mWeakEquivalenceGraph = new WeakEquivalenceGraph<>(this, original.mWeakEquivalenceGraph);
// mAllLiterals = new HashSet<>(original.mAllLiterals);
mNodeToDependents = new HashRelation<>(original.mNodeToDependents);
assert sanityCheck();
}
Expand Down Expand Up @@ -176,24 +189,13 @@ protected boolean addElementRec(final NODE elem) {
return false;
}

// if (mLiteralManager.isLiteral(elem)) {
// for (final NODE other : mLiteralManager.getDisequalities(elem, getAllLiteralElements())) {
// reportDisequalityRec(elem, other);
// }
// mAllLiterals.add(elem);
// }

// executeFloydWarshallAndReportResult();
// reportAllArrayEqualitiesFromWeqGraph();

// assert weqGraphFreeOfArrayEqualities();
return true;
}

// private Collection<NODE> getAllLiteralElements() {
// return mAllLiterals;
// }

@Override
protected CongruenceClosure<NODE> alignElementsAndFunctions(final CongruenceClosure<NODE> otherCC) {
assert !this.isInconsistent() && !otherCC.isInconsistent();
Expand Down Expand Up @@ -1235,4 +1237,4 @@ public Integer getStatistics(final VPStatistics stat) {
}
}

}
}

0 comments on commit b78bad2

Please sign in to comment.