Skip to content
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.

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

Added yml file generation and verifier class replacing random #12

Merged
merged 17 commits into from
Dec 12, 2024

Conversation

rubalgoyal
Copy link

No description provided.

@charles-moloney
Copy link
Contributor

Can we delete the files that this is adding that are not part of the business logic changed? Surely we don't need to merge 18,000 file changes to develop

@rubalgoyal
Copy link
Author

I tried to remove unnecessary files and resolved the conflicts. Please let me know if any other change that needs to be done (I am new to git so learning things).

@charles-moloney
Copy link
Contributor

I tried to remove unnecessary files and resolved the conflicts. Please let me know if any other change that needs to be done (I am new to git so learning things).

No worries! :) It is still saying there are 5000+ files being changed. We have recently configured the .gitignore to ignore files in database, benchmarks, and suitableprgms, but I think this isn't being reflected in your changes because they have already been committed. Our most current version of develop has these files deleted, which is what is creating the conflict. Could you please delete the following directories and commit that change?

/database/
/benchmarks/
/suitablePrgms/

@rubalgoyal
Copy link
Author

Hi @charles-moloney I took another shot and removed these directories from my last commit using following commands

git rm -rf database/
git rm -rf benchmarks/
git rm -rf suitablePrgms/

Can you check and confirm that these unnecessary files have been removed? Thanks.

Copy link
Contributor

@charles-moloney charles-moloney left a comment

Choose a reason for hiding this comment

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

Will advise being careful while merging (especially in transform/Main), but this overall looks good. Thank you for removing the extra files,

src/java/transform/Main.java Outdated Show resolved Hide resolved
Copy link
Contributor

@jckreg jckreg left a comment

Choose a reason for hiding this comment

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

Charles marked one and I marked 2 other spots with merge conflict markers left over

.project Outdated Show resolved Hide resolved
src/java/transform/visitors/TransformVisitor.java Outdated Show resolved Hide resolved
.idea/.gitignore Outdated Show resolved Hide resolved
src/java/transform/Main.java Outdated Show resolved Hide resolved
svcomp-benchmarks/.DS_Store Outdated Show resolved Hide resolved
@rubalgoyal
Copy link
Author

Hi @charles-moloney and @jckreg thanks for the review and feedback. I have incorporated the changes suggested. Please let me know if anything is remaining.

Further, I have included my manually converted benchmarks for the SVCOMP submission in the folder svcomp-benchmarks.

Copy link
Contributor

@jckreg jckreg left a comment

Choose a reason for hiding this comment

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

These files should be removed

svcomp-benchmarks/.DS_Store Outdated Show resolved Hide resolved
svcomp-benchmarks/ArrayBasedCollectionTimer/.DS_Store Outdated Show resolved Hide resolved
svcomp-benchmarks/Base64/.DS_Store Outdated Show resolved Hide resolved
svcomp-benchmarks/.idea/codeStyles/Project.xml Outdated Show resolved Hide resolved
jckreg
jckreg previously approved these changes Dec 10, 2024
@jckreg jckreg merged commit 1c338ad into develop Dec 12, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants