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

Fork merge: Diagram-Text tracelinks, Improvements to the MME detection capabilities #286

Merged
merged 167 commits into from
Feb 13, 2024

Conversation

menof36go
Copy link
Contributor

These changes are the result of my thesis Entity Recognition in Software Documentation Using Trace Links to Informal Diagrams

The last merge with main was commit d653a13. Some integration tests will probably fail because of the minor global changes. Generally, a favorable change is observed for the metrics. However, a small worsening in a particular metric might fail the tests.

Please let me know about any changes I should perform or oversights (e.g. missing documentation of classes I created). Before the final merge (assuming this PR is approved), I will update to the latest commit on ArDoCo main. Due to the large amount of changed files, it is likely that I missed some stuff.

Best regards,
Fabian

menof36go added 30 commits June 25, 2023 23:27
Update README.md to prevent misunderstandings
As it turns out, array references in foreach loops are evaluated every cycle. Oops.
@dfuchss
Copy link
Member

dfuchss commented Dec 23, 2023

@menof36go after holiday / in the new year, could you resolve the conflicts ? :) The progress of this PR is good; soonish we hopefully can merge it :)

@dfuchss
Copy link
Member

dfuchss commented Jan 10, 2024

@menof36go if you find some time please have a look at the PR :) We plan to adjust the architecture of ArDoCo soon and before that we want to merge the PR :)

# Conflicts:
#	framework/common/pom.xml
#	framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Box.java
#	pom.xml
#	stages/diagram-recognition/src/main/kotlin/edu/kit/kastel/mcse/ardoco/lissa/DiagramRecognition.kt
#	stages/diagram-recognition/src/main/kotlin/edu/kit/kastel/mcse/ardoco/lissa/diagramrecognition/model/DiagramImpl.kt
#	stages/pom.xml
Copy link
Member

@dfuchss dfuchss left a comment

Choose a reason for hiding this comment

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

I've reviewed all code and have some minor questions :)

Copy link

sonarcloud bot commented Feb 8, 2024

Copy link
Member

@dfuchss dfuchss left a comment

Choose a reason for hiding this comment

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

I think we have resolved the remaining major issues :)

@dfuchss dfuchss merged commit 2cb16cc into ArDoCo:main Feb 13, 2024
6 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.

2 participants