Update the concept model so that Assets can directly relate to tasks

[cardialfly]

The DODAF concept model defines Assets as a subclass/subtype of Performer, so we can associate an asset directly to a task. A similar relationship is desired in the DALNIM concept model.

See https://github.com/cardialfly/DALNIM/blob/main/Final_Concept_Model_Version1.png and https://github.com/cardialfly/DALNIM/blob/main/concept_model.tql.

[hjyoon93]

Made changes both in concept model.tql and also in the concept model figure.

[cardialfly]

I removed the Final_Concept_Model_Version1.png. This is just to avoid having multiple versions of the "same" resource/file in the main branch. If we need to retrieve any older version, we can simply checkout some older revision at git.

See commit https://github.com/cardialfly/DALNIM/commit/0263e64944cccee74d92a8353e503894ad8ca992

[cardialfly]

I reassigned this issue to myself. Let me keep this issue open until I make sure the unit tests of BPMN2TypeDB and TypeDB2BPMN are passing.

[cardialfly]

Closing this issue because it was addressed in commit https://github.com/cardialfly/DALNIM/commit/8d11748ee7c793484ee9ef85a379ac36f57e5571.

[cardialfly]

The concept_model.tql is indeed declaring Asset sub Performer in line 12, but later lines are re-declaring it as sub MIA_Entity (e.g., lines 19, 74, 86, 211).

For instance, line 74-75 declares Asset sub MIAEntity, plays hasVulnerabilities:asset;

However, there is no need to re-declare sub MIAEntity. Just Asset plays hasVulnerabilities:asset; would be enough.

Please, clean up concept_model.tql and remove all such re-declarations. This kind of issue (an error caused by multiple lines re-declaring the same subtype) also happened before (see issue 8 ), so this seems to be a recurring problem.

[hjyoon93]

I removed all redeclaration. Now I believe every declaration is done only once. Just FYI, I commented out the redeclared lines and commented "avoid redeclaration" as below so that in case you want to know which lines were removed from the typeql script.

Asset sub MIAEntity, avoid redeclaration

[cardialfly]

I confirmed that the unit tests are passing with the new concept model tql script.

See commit https://github.com/cardialfly/DALNIM/commit/e75079ddf9e5a5d16d7c1bfe46c076a2fd5da7ea

[cardialfly]

BTW, I'd rather close an issue after making sure all the tests are passing. You can either checkout the project and run the JUnit tests yourself, or just notify me so that I can run the tests instead. In the latter case, you may also ask me to close the issue after I see that the tests are passing.

[hjyoon93]

I see. I will only close it after making sure all the tests are passing.

I think we can just go with the former case. I can run the JUnit tests myself and close it moving forward.