Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ private ImmutableList<TacletApp> filterTaclet(Goal focusedGoal,
public boolean selectedTaclet(Taclet taclet, Goal goal,
PosInOccurrence pos) {
ImmutableSet<TacletApp> applics = getAppsForName(goal, taclet.name().toString(), pos);
if (applics.size() == 0) {
if (applics.isEmpty()) {
return false;
}
return selectedTaclet(applics, goal);
Expand All @@ -207,7 +207,7 @@ public boolean selectedTaclet(ImmutableSet<TacletApp> applics, Goal goal) {
if (applics.size() == 1) {
TacletApp firstApp = it.next();
boolean ifSeqInteraction = !firstApp.taclet().assumesSequent().isEmpty();
if (isMinimizeInteraction() && !firstApp.complete()) {
if (isMinimizeInteraction() && !firstApp.completeExceptSkolemConstants()) {
ImmutableList<TacletApp> ifSeqCandidates =
firstApp.findIfFormulaInstantiations(goal.sequent(), services);

Expand All @@ -229,7 +229,8 @@ public boolean selectedTaclet(ImmutableSet<TacletApp> applics, Goal goal) {
}

}
if (ifSeqInteraction || !firstApp.complete()) {
if (ifSeqInteraction || !firstApp.completeExceptSkolemConstants() ||
(!isMinimizeInteraction() && !firstApp.complete())) {
LinkedList<TacletApp> l = new LinkedList<>();
l.add(firstApp);
TacletInstantiationModel[] models = completeAndApplyApp(l, goal);
Expand Down
Loading