Merge pull request #64 from nfdi4plants/feature-newMetadataGraph-#46

#46 New metadata graph
nfdi4plants · Dec 12, 2023 · 1cf4d0a · 1cf4d0a
2 parents fe1b16a + 0dae683
commit 1cf4d0a
Show file tree

Hide file tree

Showing 25 changed files with 1,993 additions and 497 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,41 @@
-### 0.0.0 (Released 2023-5-8)
-* Additions:
-    * Initial set up for RELEASE_Notes.md
-
+### 0.0.1+6c5010d (Released 2023-12-11)
+* Additions:
+    * [[#f034fe0](https://github.com/nfdi4plants/arc-validate/commit/f034fe0b6ff43dc02c050f5576283ee4ef8aa272)] Add demo notebook(s) (to sln file)
+    * [[#6c5010d](https://github.com/nfdi4plants/arc-validate/commit/6c5010dcabee7f22a8b4b3a57abc797831aa68af)] Comment out print statements
+    * [[#48fb9f9](https://github.com/nfdi4plants/arc-validate/commit/48fb9f9ee996d5724185298a597c023eb9b3ac26)] Add release notes to solution file
+    * [[#3de881c](https://github.com/nfdi4plants/arc-validate/commit/3de881cfb8d988f686eb26b861f740198053aacb)] Copy new metadata graph functionality from script to source file
+    * [[#61460ed](https://github.com/nfdi4plants/arc-validate/commit/61460ed2544e78e5bd3dac1055e4529259d3ff73)] Add internal FGraph augmentations
+    * [[#bf4d60f](https://github.com/nfdi4plants/arc-validate/commit/bf4d60ffedc5c0565e87f41d8ddc3076f4242b54)] Add another ontology graph function
+    * [[#e3b7dc5](https://github.com/nfdi4plants/arc-validate/commit/e3b7dc535e72d8b3fedaae204fa6f0918cf43fa3)] Update Graphoscope dependency
+    * [[#5aaa8f4](https://github.com/nfdi4plants/arc-validate/commit/5aaa8f4e6f995155abb38a85cdeff57bfe120fc8)] Update prototype: split graph functionality
+    * [[#64a42f7](https://github.com/nfdi4plants/arc-validate/commit/64a42f7dcc5ab11c7f2bedfe64b8d62e432ed274)] Update vis functions
+    * [[#78f5686](https://github.com/nfdi4plants/arc-validate/commit/78f56868354a12d80f21e662e1a67922d058e6a1)] (WIP) Update prototype: split function
+    * [[#ef20f76](https://github.com/nfdi4plants/arc-validate/commit/ef20f76c0a5fd568b39bd795cbc3076ca147467a)] Update working graph
+    * [[#3329967](https://github.com/nfdi4plants/arc-validate/commit/3329967802290004723cda5d3aed7a6b0a703149)] Update CyGraph viz function
+    * [[#56b0b06](https://github.com/nfdi4plants/arc-validate/commit/56b0b06c93bfbf1484455e4cdc36b0c593d70b00)] Raise F#Aux dependency
+    * [[#b8e5c15](https://github.com/nfdi4plants/arc-validate/commit/b8e5c1544c7e06903442d0eb8ef9483314e1104b)] Update working graph and change its file directory
+    * [[#9ee242d](https://github.com/nfdi4plants/arc-validate/commit/9ee242d1de406212f14a7676f16f489da351b884)] Update ARCGraph Viz functionality
+    * [[#dc5ada4](https://github.com/nfdi4plants/arc-validate/commit/dc5ada40994f0366112ee60e4815938f590f22b9)] Upate prototype: first finish graph constructor
+    * [[#2c3d809](https://github.com/nfdi4plants/arc-validate/commit/2c3d809df59bf907ee3c89b16acdf0466f838b23)] Add new cases to ARCRelation
+    * [[#3f6340d](https://github.com/nfdi4plants/arc-validate/commit/3f6340d55f7b5fbb6969b187e3c22493a68ede79)] Add script files to sln file
+    * [[#12d6529](https://github.com/nfdi4plants/arc-validate/commit/12d652906240171f2272cf376be7aa059c081822)] Update prototype: finalize missing group terms
+    * [[#bb81ada](https://github.com/nfdi4plants/arc-validate/commit/bb81adaaa485899b0bd6d0e2b3285002ec04d89d)] Update coloring in working graph
+    * [[#a58c944](https://github.com/nfdi4plants/arc-validate/commit/a58c94476098a77ee682e895abcda156fc548dc7)] Update prototype: addMissingTermsInGroup
+    * [[#f26a9b5](https://github.com/nfdi4plants/arc-validate/commit/f26a9b580d027c9ce37c2e1d0f54c386bbfe305b)] Update working graph's visuals
+    * [[#9604978](https://github.com/nfdi4plants/arc-validate/commit/96049785322a89a84655a7a71bc890dc9cea9ca3)] Prototype: work around graph error(s)
+    * [[#5618b40](https://github.com/nfdi4plants/arc-validate/commit/5618b403856b5a3e91820686ebdd74bf11e06129)] Prototype: Finalize flowchart graph diagram
+    * [[#f9a2837](https://github.com/nfdi4plants/arc-validate/commit/f9a283779ea0761d093a804c07b9b51167631144)] Update prototype: working graph
+    * [[#fa881fa](https://github.com/nfdi4plants/arc-validate/commit/fa881fa055b2a6bb8e9e944c88da38a73fe736f3)] Add flowchart for prototype workflow
+    * [[#4dbcf11](https://github.com/nfdi4plants/arc-validate/commit/4dbcf1191123940f1cd66cc90fc9a7f18bde12cc)] Update prototype: more branching
+    * [[#1581357](https://github.com/nfdi4plants/arc-validate/commit/1581357b3d76c72e7b07e7aef639451339738c94)] Restructure playgrounds & prototypes in sln
+    * [[#2577f60](https://github.com/nfdi4plants/arc-validate/commit/2577f60bbb659a4e5f3bf00712703940a616d8b7)] Update prototype: TF deconstruction, relations
+* Bugfixes:
+    * [[#6cadf19](https://github.com/nfdi4plants/arc-validate/commit/6cadf19467518f3965237d48afa5c4ca16b732d3)] Fix build project in terms of release notes
+    * [[#30a9afd](https://github.com/nfdi4plants/arc-validate/commit/30a9afd0c7661d712c5ff1a84ba43e78e20ddd54)] Update prototype: Fix ontology graph creation bugs
+    * [[#816aa34](https://github.com/nfdi4plants/arc-validate/commit/816aa3407bc83086fa6887d030ea79211169c946)] (WIP) Update prototype: Fix ontology graph bug
+    * [[#fca6b03](https://github.com/nfdi4plants/arc-validate/commit/fca6b036b7c3c22a3b844a4ca5981ca5d7ad16cd)] (WIP) Work on bugs in prototype
+
+### 0.0.0 (Released 2023-5-8)
+* Additions:
+    * Initial set up for RELEASE_Notes.md
+
diff --git a/arc-validate.sln b/arc-validate.sln
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{B3F07465-210
 		ErrorClassOntology.obo = ErrorClassOntology.obo
 		global.json = global.json
 		README.md = README.md
+		RELEASE_NOTES.md = RELEASE_NOTES.md
 		TestOntology.obo = TestOntology.obo
 	EndProjectSection
 EndProject
@@ -46,15 +47,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "playgrounds", "playgrounds"
 	ProjectSection(SolutionItems) = preProject
 		playgrounds\arc-validation-packages.fsx = playgrounds\arc-validation-packages.fsx
 		playgrounds\argu.fsx = playgrounds\argu.fsx
-		codeGeneratorScripting.fsx = codeGeneratorScripting.fsx
-		errorClassesStatic.fsx = errorClassesStatic.fsx
-		expectoPlayground.fsx = expectoPlayground.fsx
-		getAnnotationTableCvPs.fsx = getAnnotationTableCvPs.fsx
+		playgrounds\codeGeneratorScripting.fsx = playgrounds\codeGeneratorScripting.fsx
+		playgrounds\errorClassesStatic.fsx = playgrounds\errorClassesStatic.fsx
+		playgrounds\expectoPlayground.fsx = playgrounds\expectoPlayground.fsx
+		playgrounds\getAnnotationTableCvPs.fsx = playgrounds\getAnnotationTableCvPs.fsx
 		playgrounds\github-api.fsx = playgrounds\github-api.fsx
-		graphModelIOTest.fsx = graphModelIOTest.fsx
-		graphoscopePlayground.fsx = graphoscopePlayground.fsx
-		playground.fsx = playground.fsx
-		prototype.fsx = prototype.fsx
+		playgrounds\graphModelIOTest.fsx = playgrounds\graphModelIOTest.fsx
+		playgrounds\graphoscopePlayground.fsx = playgrounds\graphoscopePlayground.fsx
+		playgrounds\playground.fsx = playgrounds\playground.fsx
+		playgrounds\workingGraph.md = playgrounds\workingGraph.md
 	EndProjectSection
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCValidationPackages", "src\ARCValidationPackages\ARCValidationPackages.fsproj", "{CF14C74E-20D2-4EC9-B11E-357BFD1244CB}"
@@ -67,6 +68,19 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCExpect", "src\ARCExpect\
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCExpect.Tests", "tests\ARCExpect.Tests\ARCExpect.Tests.fsproj", "{46EA4BDB-095A-4369-AD7E-07E702CD3E38}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "arcGraph_prototypes", "arcGraph_prototypes", "{02699157-EFC4-4E1A-94CC-B9825E2D1CB8}"
+	ProjectSection(SolutionItems) = preProject
+		playgrounds\arcGraph_playgrounds\prototype_v0.1.0.fsx = playgrounds\arcGraph_playgrounds\prototype_v0.1.0.fsx
+		playgrounds\arcGraph_playgrounds\prototype_v0.1.1.fsx = playgrounds\arcGraph_playgrounds\prototype_v0.1.1.fsx
+		playgrounds\arcGraph_playgrounds\prototype_v0.2.0.fsx = playgrounds\arcGraph_playgrounds\prototype_v0.2.0.fsx
+		playgrounds\arcGraph_playgrounds\prototype_v0.2.1.fsx = playgrounds\arcGraph_playgrounds\prototype_v0.2.1.fsx
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo_notebooks", "demo_notebooks", "{A83F65C9-925E-437C-A457-EF8B9C6B154D}"
+	ProjectSection(SolutionItems) = preProject
+		playgrounds\demo_notebooks\demo_ARCGraph.ipynb = playgrounds\demo_notebooks\demo_ARCGraph.ipynb
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -114,6 +128,8 @@ Global
 		{0DBD3705-F884-4D89-BBEC-B5BDC41905FD} = {5C204780-A94B-46A2-B768-B12C7D81DDFC}
 		{33E89EBC-A0FB-405D-9ED8-756B0CADBB28} = {6275F297-567B-421B-B055-4F88B2785765}
 		{46EA4BDB-095A-4369-AD7E-07E702CD3E38} = {5C204780-A94B-46A2-B768-B12C7D81DDFC}
+		{02699157-EFC4-4E1A-94CC-B9825E2D1CB8} = {7994D526-5B21-4EBD-9CCB-EFA04EE303CF}
+		{A83F65C9-925E-437C-A457-EF8B9C6B154D} = {B3F07465-2108-4C43-843A-9F503044FDB7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FF9C2722-38D9-48C4-8095-4726C56E92DE}

diff --git a/build/Build.fs b/build/Build.fs
@@ -41,6 +41,8 @@ let _preReleaseNoDocs =
         "PreReleaseNoDocs" 
         [setPrereleaseTag; clean; build; runTests; packPrerelease; createPrereleaseTag; publishNugetPrerelease]
 
+let _releaseNotes = ReleaseNotesTasks.updateReleaseNotes
+
 [<EntryPoint>]
 let main args = 
     runOrDefault build args
diff --git a/ErrorClassOntology.obo → playgrounds/ErrorClassOntology.obo b/ErrorClassOntology.obo → playgrounds/ErrorClassOntology.obo
diff --git a/TestOntology.obo → playgrounds/TestOntology.obo b/TestOntology.obo → playgrounds/TestOntology.obo