arnekeller/Typicalc
1
0
Fork 0
mirror of https://gitlab.kit.edu/uskyk/typicalc.git synced 2024-11-08 18:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge-Fehler behoben

Browse Source
This commit is contained in:
uogau 2021-01-27 21:07:29 +01:00
parent 6763632df8
commit 938cd7e698
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/edu/kit/typicalc/model/step/InferenceStep.java
View File

@ -1,11 +1,8 @@
package edu.kit.typicalc.model.step;
import edu.kit.typicalc.model.Conclusion;
<<<<<<< HEAD
import edu.kit.typicalc.model.Constraint;
=======
>>>>>>> 0f6c701 (Checkstyle für Maven konfiguriert)
/**
* Models one step of the inference tree.
* Depending on the inference rule that is applied in a step,
@ -21,6 +18,7 @@ public abstract class InferenceStep {
/**
* Initializes a new InferenceStep with the given values.
*
* @param conclusion the conclusion of this step
* @param constraint the constraint added in this step
*/
@ -31,6 +29,7 @@ public abstract class InferenceStep {
/**
* Getter for the Conclusion of this step.
*
* @return conclusion the conclusion of this step
*/
public Conclusion getConclusion() {
@ -39,6 +38,7 @@ public abstract class InferenceStep {
/**
* Getter for the Constraint added in this step.
*
* @return conclusion the constraint added in this step
*/
public Constraint getConstraint() {
@ -47,16 +47,8 @@ public abstract class InferenceStep {
/**
* Accepts a visitor.
*
* @param stepVisitor the visitor that wants to visit this object
*/
public abstract void accept(StepVisitor stepVisitor);
<<<<<<< HEAD
}
=======
public Conclusion getConclusion() {
return null; // TODO
}
}
>>>>>>> 0f6c701 (Checkstyle für Maven konfiguriert)