Skip to content

Make renumbering of proof derivation steps optional #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abchugh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make renumbering of proof derivation steps optional #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/mmj/pa/ProofAsst.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,7 +1667,7 @@ private ProofWorksheet getExportedProofWorksheet(final Theorem theorem,
try {
proofDerivationStepList = verifyProofs.getProofDerivationSteps(
theorem, exportFormatUnified, hypsOrder,
getProvableLogicStmtTyp());
getProvableLogicStmtTyp(), true);

proofWorksheet = new ProofWorksheet(theorem,
proofDerivationStepList, deriveFormulas, proofAsstPreferences,
Expand Down
10 changes: 6 additions & 4 deletions src/mmj/verify/VerifyProofs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,20 +472,22 @@ public VerifyException verifyDerivStepDjVars(final String derivStepNbr,
*/
public List<ProofDerivationStepEntry> getProofDerivationSteps(
final Theorem theorem, final boolean exportFormatUnified,
final HypsOrder hypsOrder, final Cnst provableLogicStmtTyp)
final HypsOrder hypsOrder, final Cnst provableLogicStmtTyp,
final boolean renumberSteps)
throws VerifyException
{

final LogHyp[] theoremLogHypArray = theorem.getLogHypArray();
final List<ProofDerivationStepEntry> derivStepList = new ArrayList<>(
theoremLogHypArray.length);

int renumberStep = PaConstants.PROOF_STEP_RENUMBER_START;

int renumberStep = renumberSteps ? PaConstants.PROOF_STEP_RENUMBER_START : 0;
int renumberInterval = renumberSteps ? PaConstants.PROOF_STEP_RENUMBER_INTERVAL : 1;
for (final LogHyp element : theoremLogHypArray) {
final ProofDerivationStepEntry e = new ProofDerivationStepEntry();
e.isHyp = true;
e.step = Integer.toString(renumberStep);
renumberStep += PaConstants.PROOF_STEP_RENUMBER_INTERVAL;
renumberStep += renumberInterval;
e.hypStep = new String[0];
e.refLabel = element.getLabel();
e.formula = element.getFormula();
Expand Down