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.

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

Jump to bottom

1383 use analysis result in power requirements analysis #2547

Draft
wants to merge 28 commits into
base: master
Choose a base branch
from
Draft

1383 use analysis result in power requirements analysis #2547

wants to merge 28 commits into from

Conversation

asazonova
Copy link
Contributor

Rebuild power requirements analysis to use analysisResult object. Method that produces an excel file also uses analysisResult object

fixes #1383

@lwrage lwrage removed their request for review December 14, 2020 20:25
@asazonova asazonova self-assigned this Jan 4, 2021
@asazonova
Copy link
Contributor Author

asazonova commented Jan 4, 2021 •
edited
Loading

@AaronGreenhouse I'm confused. Jenkins seems to point to failing tests in org.osate.analysis.resource.budgets.tests. But when I run all those tests locally, they pass. My local branch is up to date ... Is there something else I am missing? Was there a maven run configuration I need to execute to update the test.java file? I assumed I only need to commit the .xtend test file and it will get regenerated automatically

@AaronGreenhouse
Copy link
Contributor

As discussed over Slack/e-mail this issue needs further work to further revise the internal model, and to further restructure the class hierarchy of analysis classes and command handler classes. These will be addressed in future meetings.

An immediate issue is that the help text shows up in the table of contents, but the link doesn't work. This is because the HTML for the help text is missing. It is not automatically generated from the markdown, but needs to be manually added to the project in the help/html directory. This is a "shadow" of the help/markdown directory, so any images you add markdown need to be copied here as well.

I've been using MacDown https://macdown.uranusjr.com/ to generate HTML from the markdown file.

@AaronGreenhouse
Copy link
Contributor

Actually this is wrong. The project is supposed to autogenerating the html file. I'm not sure why this isn't working.

An immediate issue is that the help text shows up in the table of contents, but the link doesn't work. This is because the HTML for the help text is missing. It is not automatically generated from the markdown, but needs to be manually added to the project in the help/html directory. This is a "shadow" of the help/markdown directory, so any images you add markdown need to be copied here as well.

@AaronGreenhouse
Copy link
Contributor

Feeling dumb: Forgot to run "Generate Help" from the eclipse run configurations.

Help text is okay.

asazonova and others added 22 commits June 14, 2021 07:57
@asazonova
initial attempt to restructure power requirement analysis
1574820
@asazonova
link new handler to UI. verify that it gets called
acb5f8c
@asazonova
carry over code from old analysis file
e122f93
@asazonova
start on the model
ad92495
@asazonova
build up a model for power requirements analysis
df3fc77
@asazonova
Add in a visitor to build up results
06e43e8
@asazonova
changing how the visitor is called
f2d689c
@asazonova
add system and som name to results
ecdd602
@asazonova
finish up analysisResult object and add an excel report for Power
13fbf0c 
Analysis
@asazonova
add description of returned object. clean up unused functions
253e764
@asazonova
Add in markers. Move and add to power analysis markdown. Add JUnit test
063f732
@asazonova
add 2 more tests
9cf4660
@asazonova
Correct no supply test: since EPSU system is set to 0 power supply, it
11dc0f2 
is not pulled in to the object as a power supplier
@asazonova
rename folder to match path in test
a2a61a8
@asazonova
add html file for power analysis
96e399f
@asazonova
Revert "add html file for power analysis"
73bfe6d 
This reverts commit 27aa064.
@AaronGreenhouse @asazonova
Reverted org.osate.results to match the master branch. This shouldn't
f471ac9 
have been changed.
@AaronGreenhouse @asazonova
Fixed plugin support version depedencies
2e02a77
@AaronGreenhouse @asazonova
Fixed versionsing problem
8c33daa
@asazonova
add EMF model for power requirements analysis
5d3edfd
@asazonova
new ecore model and generated code for power requirement analysis
5a0f29d
@asazonova
Merge remote-tracking branch 'origin/master' into 1383_update_analysi…
cc3b672 
…s_with_EMF
@asazonova asazonova force-pushed the 1383_use_AnalysisResult_in_power_requirements_analysis branch from 72793ac to ec82b6a Compare July 13, 2021 17:55
lwrage
lwrage requested changes Jul 13, 2021
View reviewed changes
Copy link
Contributor

@lwrage lwrage left a comment

Choose a reason for hiding this comment

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

I found a couple of little things that could be improved.

analyses/org.osate.analysis.resource.budgets/META-INF/MANIFEST.MF Outdated Show resolved Hide resolved
analyses/org.osate.analysis.resource.budgets/META-INF/MANIFEST.MF Outdated Show resolved Hide resolved
analyses/org.osate.analysis.resource.budgets/META-INF/MANIFEST.MF Outdated Show resolved Hide resolved
analyses/org.osate.analysis.resource.budgets/META-INF/MANIFEST.MF Outdated Show resolved Hide resolved
analyses/org.osate.analysis.resource.budgets/META-INF/MANIFEST.MF Outdated Show resolved Hide resolved
core/org.osate.help/META-INF/MANIFEST.MF Outdated Show resolved Hide resolved
asazonova and others added 4 commits July 13, 2021 14:42
@asazonova
revert manifests
2360fd5
@asazonova
Merge branch 'master' into 1383_use_AnalysisResult_in_power_requireme…
8c6b2f5 
…nts_analysis
@asazonova
Merge branch '1383_use_AnalysisResult_in_power_requirements_analysis' of
2c173ee 
https://[email protected]/osate/osate2.git into
1383_use_AnalysisResult_in_power_requirements_analysis

Conflicts:
	analyses/org.osate.analysis.resource.budgets/META-INF/MANIFEST.MF
	analyses/org.osate.analysis.resource.budgets/model/power.aird
	analyses/org.osate.analysis.resource.budgets/model/power.ecore
	analyses/org.osate.analysis.resource.budgets/model/power.genmodel
	analyses/org.osate.analysis.resource.budgets/src/org/osate/analysis/resource/budgets/handlers/NewAbstractAaxlHandler.java
	analyses/org.osate.analysis.resource.budgets/src/org/osate/analysis/resource/budgets/handlers/NewBusLoadAnalysisHandler.java
@asazonova
Merge branch 'master' into 1383_use_AnalysisResult_in_power_requireme…
c56a978 
…nts_analysis
@asazonova asazonova marked this pull request as draft October 11, 2021 14:30
@lwrage lwrage force-pushed the 1383_use_AnalysisResult_in_power_requirements_analysis branch from a397ace to 7d234a0 Compare February 6, 2022 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lwrage lwrage lwrage requested changes

@AaronGreenhouse AaronGreenhouse Awaiting requested review from AaronGreenhouse

Requested changes must be addressed to merge this pull request.

Assignees

@asazonova asazonova

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update resource budget analyses to use AnalysisResult -> power requirements
3 participants
@asazonova @AaronGreenhouse @lwrage