Skip to content
This repository has been archived by the owner on Oct 3, 2021. It is now read-only.

Adding a property that should fail in the Wheel Brake System as a benchmark #825

Merged
merged 4 commits into from
Nov 21, 2019

Conversation

vaibhavbsharma
Copy link
Contributor

This version of Wheel Brake System has been part of the SPF repository
for the past few years. It can be found at https://github.com/SymbolicPathFinder/jpf-symbc/blob/master/src/examples/WBS.java. In this commit, I am dding it to the SV-COMP repository of benchmarks so that other tools can also benefit from it.

  • WBS_prop1 is the name of the newly added benchmark

  • sym-link to the jpf-regression license file has been added

  • contributed by developers of Java Ranger (https://github.com/vaibhavbsharma/java-ranger). This benchmark originates from the WBS version maintained in the src/examples directory of the source code of SPF as mentioned earlier.

  • The ReachSafety.set category has been updated to now include benchmarks in the java-ranger-regression directory

  • assert.prp should be used to verify the intended property

  • expected answer has been added WBS_prop1.yml

Copy link
Contributor

@mmuesly mmuesly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you Vaibhav for contributing this test case! I have a couple of questions and further ideas, I leave here for discussion.

java/java-ranger-regression/WBS_prop1/Main.java Outdated Show resolved Hide resolved
java/java-ranger-regression/WBS_prop1/Main.java Outdated Show resolved Hide resolved
java/java-ranger-regression/WBS_prop1/Main.java Outdated Show resolved Hide resolved
java/java-ranger-regression/WBS_prop1/Main.java Outdated Show resolved Hide resolved
benchmark

This version of Wheel Brake System has been part of the SPF repository
for the past few years. It can be found at https://github.com/SymbolicPathFinder/jpf-symbc/blob/master/src/examples/WBS.java. In this commit, I am dding it to the SV-COMP repository of benchmarks so that other tools can also benefit from it.
I've deleted commented lines and used a loop to run WBS 10 times instead
of 10 calls to WBS' step function.
@vaibhavbsharma
Copy link
Contributor Author

I've made changes to this benchmark based on discussions in #860. Please let me know if anything else is required for this benchmark to be merged.

Copy link
Contributor

@mmuesly mmuesly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vaibhavbsharma thank you for picking up the discussion. I think there is still a small change missing, unless I am misinterpreting the input_files semantic in the task yml.

Could you shortly explain, how this relates to the already merged PRs #860, #861, #862?
My implicit and naive expectation is that this change should affect the files introduced by them as well.

Following the discussion on #860, I would expect that you merge property one in the same format as #860,#861,#862 and we rework all of them in January, or you rework all of them now in alignment with this PR. Otherwise, it feels from my point of view like doing only half of the change now. But I am open to other opinions.

@vaibhavbsharma
Copy link
Contributor Author

Thanks for looking at my PR, @mmuesly!! I've addressed your comments and also integrated the 3 additional properties from #860, #861, and #862 into this pull request.

@mmuesly
Copy link
Contributor

mmuesly commented Nov 21, 2019

@vaibhavbsharma I think you are still missing to remove this file: https://github.com/sosy-lab/sv-benchmarks/blob/master/java/java-ranger-regression/WBS_prop4/Main.java

Once that is done, this PR should be ready to merge.

Copy link
Contributor

@peterschrammel peterschrammel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And please pipe the sources through a code formatter

@vaibhavbsharma
Copy link
Contributor Author

@vaibhavbsharma I think you are still missing to remove this file: https://github.com/sosy-lab/sv-benchmarks/blob/master/java/java-ranger-regression/WBS_prop4/Main.java

Once that is done, this PR should be ready to merge.

I did delete WBS_prop4/Main.java in this commit: cd4bd89

@dbeyer dbeyer merged commit 3de3437 into sosy-lab:master Nov 21, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Development

Successfully merging this pull request may close these issues.

4 participants