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

Fix/quotient #74

Merged
merged 38 commits into from
Oct 29, 2022
Merged

Fix/quotient #74

merged 38 commits into from
Oct 29, 2022

Conversation

Brandhoej
Copy link
Contributor

@Brandhoej Brandhoej commented Sep 27, 2022

Fixes quotient and removes redundant Location classes (SymbolicLocation, ComplexLocation, SimpleLocation, UniversalLocation, InconsistentLocation).

Description

  • selfLoopNonZeno.xml file was used in a test and caused the CI to fail as the file was placed in the incorrect directory. It is now in samples/xml which fixes this issue.
  • GrpcServer Used port 80 which caused port conflicts when running without a port specification, as this is the standard HTTP port. Changing it to port 9000 fixes this.
  • Print statements have been replaced to use Log.
  • ``instanceof```for locations (Mostly Symbolic Location in e.g. Quotient) have been replaced with matching property getters.
  • Quotient now uses a common way of generating the Automaton, which then allowed us to remove some tests taking too long with Quotient Automaton generation such as newQuotientTest4AAutomaton.
  • e2e tests now supports xml file configurations.
  • The location now have factory methods instead of public construtors which allows us to handle memory with object pools later.

Opens

If this PR gets merged then I think the following issues should be opened:

Related issues

closes #71
closes #72
closes #65

@Brandhoej Brandhoej mentioned this pull request Oct 2, 2022
@Brandhoej Brandhoej linked an issue Oct 2, 2022 that may be closed by this pull request
src/connection/GrpcServer.java Outdated Show resolved Hide resolved
src/logic/Refinement.java Outdated Show resolved Hide resolved
src/logic/Refinement.java Outdated Show resolved Hide resolved
src/logic/Refinement.java Outdated Show resolved Hide resolved
src/logic/SimpleTransitionSystem.java Outdated Show resolved Hide resolved
src/logic/Quotient.java Outdated Show resolved Hide resolved
src/logic/Quotient.java Outdated Show resolved Hide resolved
src/logic/Quotient.java Outdated Show resolved Hide resolved
src/logic/Quotient.java Outdated Show resolved Hide resolved
src/logic/Quotient.java Outdated Show resolved Hide resolved
src/models/Location.java Outdated Show resolved Hide resolved
src/models/Location.java Outdated Show resolved Hide resolved
src/models/Location.java Outdated Show resolved Hide resolved
src/models/Location.java Outdated Show resolved Hide resolved
src/models/Location.java Outdated Show resolved Hide resolved
src/models/Location.java Outdated Show resolved Hide resolved
src/models/Location.java Outdated Show resolved Hide resolved
src/models/Location.java Outdated Show resolved Hide resolved
src/parser/XMLParser.java Outdated Show resolved Hide resolved
src/parser/XMLParser.java Outdated Show resolved Hide resolved
@Brandhoej Brandhoej added documentation Improvements or additions to documentation enhancement New feature or request labels Oct 23, 2022
Copy link
Contributor

@magoorden magoorden left a comment

Choose a reason for hiding this comment

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

Nice work!

@magoorden
Copy link
Contributor

Th CI pipeline is finally running the tests. One test case is failing. @Brandhoej is this the test case we talked about last Monday?

@Brandhoej
Copy link
Contributor Author

Brandhoej commented Oct 29, 2022

Th CI pipeline is finally running the tests. One test case is failing. @Brandhoej is this the test case we talked about last Monday?

@magoorden I found that the CI was not running because of a merge conflict, and yes it is the "Various" "testFromFramework4".

@magoorden
Copy link
Contributor

Remember to open issues for those mentioned in the merge request description.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working documentation Improvements or additions to documentation enhancement New feature or request
Projects
None yet
2 participants