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

Merge dpsim and dpsim-villas and reorganize project structure #94

Merged
merged 83 commits into from
Jul 27, 2022
Merged

Merge dpsim and dpsim-villas and reorganize project structure #94

merged 83 commits into from
Jul 27, 2022

Conversation

JTS22
Copy link
Contributor

@JTS22 JTS22 commented May 27, 2022 •
edited
Loading

This PR merges all commits of the dpsim-villas project into the dpsim repository. Additionally, the folder and cmake structure in dpsim is changed to make it more organized. The repository is now split into the three folders dpsim-models, dpsim, and dpsim-villas, with each folder including their own cmake configuration as well as src and include folders. This structure enables a cleaner cmake configuration in which it is easier to only built and debug specific parts of dpsim. Generally, dpsim-villas depends on dpsim which in turn depends on dpsim-models. The Cpp examples are linked to either the dpsim or dpsim-villas targets.

@m-mirz m-mirz mentioned this pull request Jun 7, 2022
Open
@JTS22 JTS22 force-pushed the reorganization branch 4 times, most recently from df994ae to e10c9ae Compare June 28, 2022 14:03
@JTS22 JTS22 mentioned this pull request Jul 12, 2022
Closed
@JTS22 JTS22 marked this pull request as ready for review July 14, 2022 14:17
m-mirz and others added 23 commits July 20, 2022 10:04
@m-mirz @JTS22
add initial code
129d9f1 
Signed-off-by: Markus Mirz <mmirz@eonerc.rwth-aachen.de>
@m-mirz @JTS22
update config paths
c9b4fc9 
Signed-off-by: Markus Mirz <mmirz@eonerc.rwth-aachen.de>
@m-mirz @JTS22
update script paths
2ac02e1 
Signed-off-by: Markus Mirz <mmirz@eonerc.rwth-aachen.de>
@m-mirz @JTS22
add pybind module with shmem interface
1a33d35 
Signed-off-by: Markus Mirz <mmirz@eonerc.rwth-aachen.de>
@m-mirz @JTS22
refactor module name
c5e8235 
Signed-off-by: Markus Mirz <mmirz@eonerc.rwth-aachen.de>
@m-mirz @JTS22
Update README
aecec14 
Signed-off-by: Markus Mirz <mmirz@eonerc.rwth-aachen.de>
@m-mirz @JTS22
update examples for simulation refactoring
7656171 
Signed-off-by: Markus Mirz <mmirz@eonerc.rwth-aachen.de>
@stv0g @JTS22
pybind: add function for exporting VILLAS configuration matching the …
f957e55 
…shmem interface

Signed-off-by: Steffen Vogel <post@steffenvogel.de>
@m-mirz @JTS22
fix villas getConfig
6559f36 
Signed-off-by: Markus Mirz <mmirz@eonerc.rwth-aachen.de>
@m-mirz @JTS22
never drop villas read task
7583c99 
Signed-off-by: Markus Mirz <mmirz@eonerc.rwth-aachen.de>
@JTS22
adapt to new villas cpp version
4d3aca6 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
create InterfaceVillas stub files
6cd968c 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
clean up InterfaceVillas files
1680a69 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
add new CMakeLists for dpsim-villas
6f0da75 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
implement node lifecycle
f27c59f 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
include basic python example for testing
354313b 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
add Cpp example for debugging
7559d9f 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
add examples for file node type
11030c2 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
create superclass for shared functionality
decf617 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
initialize samples from memory pool
5ba15c0 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
fix writing to mqtt
484cc4b 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
only read/write if there are attributes to import / export
10a3603 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
add timestamp and sequence number to sample
8c055e7 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
JTS22 added 19 commits July 20, 2022 10:08
@JTS22
fix dpsim-villas include paths
5ff3b85 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
fix examples path in sonar workflow
93b8b49 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
fix library names
f46a64a 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
move dpsim-villas examples to dpsim-villas folders
9b37b9b 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
replace all example path occurences
3229766 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
lowercase Configs und Packaging folder
164c91a 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
fix include path
c3d4906 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
change all Examples path occurences
8fbcbc9 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
remove trailing slashes in gitlab ci paths
b339c5a 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
remove preceding slash in gitlab ci paths
e8c80f0 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
decrease minimum cmake version
a6797cf 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
update to newest VillasNode version
fe3e08f 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
move villas examples into common folder
fc36431 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
adapt villas examples to the new attribute system
7efab86 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
set some attributes to dynamic for importing
ba8f19d 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
fix some minor errors in villas examples
085bf0e 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
fix example paths in startup script
4fed14f 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
move old examples into villas-deprecated folder
4f636d1 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
export complex attributes instead of matrices
1c6525a 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@JTS22
output dpsimpyvillas into top-level build directory
ec70989 
Signed-off-by: Jonas Schroeder <jonas.schroeder1@rwth-aachen.de>
@sonarcloud
Copy link

sonarcloud bot commented Jul 20, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

Bug E 20 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot E 7 Security Hotspots
Code Smell A 5619 Code Smells

0.0% 0.0% Coverage
11.1% 11.1% Duplication

@m-mirz m-mirz merged commit b0bd03c into master Jul 27, 2022
@m-mirz m-mirz deleted the reorganization branch November 9, 2022 15:01
leonardocarreras added a commit that referenced this pull request Nov 10, 2023
@leonardocarreras
Fixes the doxygen documentation input line
9f9c80d 
With the new structure in PR #94, that is:
* dpsim
* dpsim-models
* dpsim-villas
each one has a src and include folders. This breaks the INPUT argument in Doxygen.

This commit fixes #260.

Signed-off-by: Leonardo Carreras <leonardo.carreras@eonerc.rwth-aachen.de>
@leonardocarreras leonardocarreras mentioned this pull request Nov 10, 2023
Merged
m-mirz pushed a commit that referenced this pull request Mar 1, 2024
@leonardocarreras @m-mirz
Fixes the doxygen documentation input line
2f92013 
With the new structure in PR #94, that is:
* dpsim
* dpsim-models
* dpsim-villas
each one has a src and include folders. This breaks the INPUT argument in Doxygen.

This commit fixes #260.

Signed-off-by: Leonardo Carreras <leonardo.carreras@eonerc.rwth-aachen.de>
m-mirz added a commit that referenced this pull request Mar 1, 2024
@m-mirz
Fixes to the doxygen documentation INPUT line (#264)
29c0145 
With the new structure in PR #94, that is:
* dpsim
* dpsim-models
* dpsim-villas each one has a src and include folders. This breaks the
INPUT argument in Doxygen.

This commit fixes this and resolves #260.
martinmoraga pushed a commit that referenced this pull request Mar 22, 2024
@leonardocarreras @martinmoraga
Fixes the doxygen documentation input line
abfd660 
With the new structure in PR #94, that is:
* dpsim
* dpsim-models
* dpsim-villas
each one has a src and include folders. This breaks the INPUT argument in Doxygen.

This commit fixes #260.

Signed-off-by: Leonardo Carreras <leonardo.carreras@eonerc.rwth-aachen.de>
martinmoraga pushed a commit that referenced this pull request Mar 22, 2024
@leonardocarreras @martinmoraga
Fixes the doxygen documentation input line
8d07917 
With the new structure in PR #94, that is:
* dpsim
* dpsim-models
* dpsim-villas
each one has a src and include folders. This breaks the INPUT argument in Doxygen.

This commit fixes #260.

Signed-off-by: Leonardo Carreras <leonardo.carreras@eonerc.rwth-aachen.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
DPsim
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@JTS22 @m-mirz @stv0g