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

319 nci functionality analysis accept new input #323

Merged
merged 5 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to the INCORE documents generated by Sphinx package will be
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

### Fixed
- NCI Functionality analysis accept new input [#319](https://github.com/IN-CORE/incore-docs/issues/319)

## [4.8.0] - 2023-12-13

### Added
Expand Down
21 changes: 11 additions & 10 deletions manual_jb/content/analyses/nci_functionality.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,17 @@ key name | type | name | description

key name | type | name | description
--- | --- | --- | ---
`epf_network` <sup>*</sup> | [`incore:epnNetwork`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:epnNetwork) | Electric Power Facility Network | Electric Power Facility Network Dataset.
`wds_network` <sup>*</sup> | [`incore:waterNetwork`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:waterNetwork) | Water Distribution Facility Network | Water Distribution Facility Network Dataset.
`epf_wds_intdp_table` <sup>*</sup> | [`incore:networkInterdependencyTable`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:networkInterdependencyTable) | EPN-to-WDS Interdependency | EPN-to-WDS Interdependency Table.
`wds_epf_intdp_table` <sup>*</sup> | [`incore:networkInterdependencyTable`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:networkInterdependencyTable) | WDS-to-EPN Interdependency | WDS-to-EPN Interdependency Table.
`epf_subst_failure_results` <sup>*</sup> | [`incore:failureProbability`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:failureProbability) | Substation failure probability | Substation failure probability Dataset.
`epf_inventory_rest_map` <sup>*</sup> | [`incore:inventoryRestorationMap`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:inventoryRestorationMap) | EPN inventory restoration map | EPN inventory restoration Map.
`epf_time_results` <sup>*</sup> | [`incore:epfRestorationTime`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:epfRestorationTime) | EP facility restoration time | EP facility restoration time Dataset.
`wds_dmg_results` <sup>*</sup> | [`ergo:waterFacilityDamageVer6`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:waterFacilityDamageVer6) | Water facility damage | Water Facility Damage Dataset.
`wds_inventory_rest_map` <sup>*</sup> | [`incore:inventoryRestorationMap`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:inventoryRestorationMap) | WDS inventory restoration map | WDS inventory restoration Map.
`wds_time_results` <sup>*</sup> | [`incore:waterFacilityRestorationTime`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:waterFacilityRestorationTime) | Water facility restoration time | Water facility restoration time Dataset.
`epf_network` <sup>*</sup> | [`incore:epnNetwork`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:epnNetwork) | Electric Power Facility Network | Electric Power Facility Network Dataset.<br/>`wds_network` <sup>*</sup> | [`incore:waterNetwork`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:waterNetwork) | Water Distribution Facility Network | Water Distribution Facility Network Dataset.
`epf_wds_intdp_table` <sup>*</sup> | [`incore:networkInterdependencyTable`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:networkInterdependencyTable) | EPN-to-WDS Interdependency | EPN-to-WDS Interdependency Table.
`wds_epf_intdp_table` <sup>*</sup> | [`incore:networkInterdependencyTable`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:networkInterdependencyTable) | WDS-to-EPN Interdependency | WDS-to-EPN Interdependency Table.
`epf_subst_failure_results` <sup>*</sup> | [`incore:failureProbability`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:failureProbability) | Substation failure probability | Substation failure probability Dataset.
`epf_inventory_rest_map` <sup>*</sup> | [`incore:inventoryRestorationMap`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:inventoryRestorationMap) | EPN inventory restoration map | EPN inventory restoration Map.
`epf_time_results` <sup>*</sup> | [`incore:epfRestorationTime`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:epfRestorationTime) | EP facility restoration time | EP facility restoration time Dataset.
`wds_dmg_results` <sup>*</sup> | [`ergo:waterFacilityDamageVer6`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:waterFacilityDamageVer6) | Water facility damage | Water Facility Damage Dataset.
`wds_inventory_rest_map` <sup>*</sup> | [`incore:inventoryRestorationMap`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:inventoryRestorationMap) | WDS inventory restoration map | WDS inventory restoration Map.
`wds_time_results` <sup>*</sup> | [`incore:waterFacilityRestorationTime`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:waterFacilityRestorationTime) | Water facility restoration time | Water facility restoration time Dataset.
`epf_damage` <sup>*</sup> | [`incore:epfDamageVer3`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:epfDamageVer3) | Electric Power Facility Damage | Electric Power Facility Damage Dataset.


**Output datasets**

Expand Down
46 changes: 1 addition & 45 deletions notebooks/nci_functionality.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
Expand Down Expand Up @@ -64,9 +61,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%% md\n"
}
},
"source": [
Expand All @@ -80,9 +74,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
Expand Down Expand Up @@ -110,9 +101,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%% md\n"
}
},
"source": [
Expand All @@ -126,9 +114,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
Expand All @@ -153,9 +138,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%% md\n"
}
},
"source": [
Expand All @@ -169,9 +151,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
Expand Down Expand Up @@ -199,9 +178,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%% md\n"
}
},
"source": [
Expand All @@ -215,9 +191,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
Expand Down Expand Up @@ -247,9 +220,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%% md\n"
}
},
"source": [
Expand All @@ -263,9 +233,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
Expand All @@ -291,9 +258,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%% md\n"
}
},
"source": [
Expand All @@ -307,9 +271,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
Expand All @@ -327,6 +288,7 @@
"nci_func.set_input_dataset(\"wds_dmg_results\", wds_dmg_results)\n",
"nci_func.set_input_dataset(\"wds_inventory_rest_map\", wds_inventory_rest_map)\n",
"nci_func.set_input_dataset(\"wds_time_results\", wds_time_results)\n",
"nci_func.set_input_dataset(\"epf_damage\", substation_dmg_result)\n",
"nci_func.run_analysis()"
]
},
Expand All @@ -336,9 +298,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%% md\n"
}
},
"source": [
Expand All @@ -352,9 +311,6 @@
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
Expand Down
Loading