Skip to content
Snippets Groups Projects
Commit 4c2fb9f2 authored by imcovangent's avatar imcovangent
Browse files

Solved issue with plot pausing. 

Solved issue with floating nodes in graph.
Added more advanced graph plotting options (color_settings) for sinks and node types.
Created separate sellarProblem.py file (to be used as test file during development).
parent 9133c654
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 98
− 103
View file @ 4c2fb9f2
...@@ -2,22 +2,7 @@ ...@@ -2,22 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="d3e74292-1e1a-4cba-81b3-9c9d67f586ca" name="Default" comment=""> <list default="true" id="d3e74292-1e1a-4cba-81b3-9c9d67f586ca" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/pyKADMOS/graphml_test.graphml" afterPath="" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/sellarProblem.py" />
<change type="DELETED" beforePath="$PROJECT_DIR$/pyKADMOS/test.graphml" afterPath="" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/AGILE_DC1_L0_MDA.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS/AGILE_DC1_L0_MDA.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/D1-input.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/D1-input.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/D1-output.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/D1-output.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/D150_fake.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS/D150_fake.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/D2-input.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/D2-input.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/D2-output.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/D2-output.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/F-input.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/F-input.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/F-output.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/F-output.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/G1-input.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-input.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/G1-output.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-output.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/G2-input.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/G2-input.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/G2-output.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/G2-output.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/cpacs_schema.xsd" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS/cpacs_schema.xsd" />
<change type="MOVED" beforePath="$PROJECT_DIR$/pyKADMOS/data_schema.xsd" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/data_schema.xsd" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" afterPath="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" afterPath="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" />
</list> </list>
...@@ -35,7 +20,8 @@ ...@@ -35,7 +20,8 @@
<component name="CoverageDataManager"> <component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/KADMOS$testPyGraphML.coverage" NAME="testPyGraphML Coverage Results" MODIFIED="1461094575316" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" /> <SUITE FILE_PATH="coverage/KADMOS$testPyGraphML.coverage" NAME="testPyGraphML Coverage Results" MODIFIED="1461094575316" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" />
<SUITE FILE_PATH="coverage/KADMOS$demo.coverage" NAME="demo Coverage Results" MODIFIED="1461312857549" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" /> <SUITE FILE_PATH="coverage/KADMOS$demo.coverage" NAME="demo Coverage Results" MODIFIED="1461312857549" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" />
<SUITE FILE_PATH="coverage/KADMOS$demo_OO.coverage" NAME="demo_OO Coverage Results" MODIFIED="1462287331196" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" /> <SUITE FILE_PATH="coverage/KADMOS$demo_OO.coverage" NAME="demo_OO Coverage Results" MODIFIED="1462541498788" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" />
<SUITE FILE_PATH="coverage/KADMOS$sellarProblem.coverage" NAME="sellarProblem Coverage Results" MODIFIED="1462541570982" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" />
</component> </component>
<component name="CreatePatchCommitExecutor"> <component name="CreatePatchCommitExecutor">
<option name="PATCH_PATH" value="" /> <option name="PATCH_PATH" value="" />
...@@ -49,8 +35,8 @@ ...@@ -49,8 +35,8 @@
<file leaf-file-name="MDOproblem.py" pinned="false" current-in-tab="true"> <file leaf-file-name="MDOproblem.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pyKADMOS/MDOproblem.py"> <entry file="file://$PROJECT_DIR$/pyKADMOS/MDOproblem.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="422"> <state relative-caret-position="614">
<caret line="630" column="51" selection-start-line="630" selection-start-column="51" selection-end-line="630" selection-end-column="51" /> <caret line="701" column="70" selection-start-line="701" selection-start-column="70" selection-end-line="701" selection-end-column="70" />
<folding> <folding>
<element signature="e#0#9#0" expanded="true" /> <element signature="e#0#9#0" expanded="true" />
</folding> </folding>
...@@ -58,6 +44,18 @@ ...@@ -58,6 +44,18 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="sellarProblem.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pyKADMOS/sellarProblem.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="584">
<caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
...@@ -93,6 +91,9 @@ ...@@ -93,6 +91,9 @@
<option value="$PROJECT_DIR$/pyKADMOS/D2-output.xml" /> <option value="$PROJECT_DIR$/pyKADMOS/D2-output.xml" />
<option value="$PROJECT_DIR$/pyKADMOS/demo_OO.py" /> <option value="$PROJECT_DIR$/pyKADMOS/demo_OO.py" />
<option value="$PROJECT_DIR$/pyKADMOS/utilities.py" /> <option value="$PROJECT_DIR$/pyKADMOS/utilities.py" />
<option value="$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-input.xml" />
<option value="$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-output.xml" />
<option value="$PROJECT_DIR$/pyKADMOS/sellarProblem.py" />
<option value="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" /> <option value="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" />
</list> </list>
</option> </option>
...@@ -104,9 +105,8 @@ ...@@ -104,9 +105,8 @@
<sorting>DEFINITION_ORDER</sorting> <sorting>DEFINITION_ORDER</sorting>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="y" value="23" /> <option name="width" value="1280" />
<option name="width" value="1920" /> <option name="height" value="800" />
<option name="height" value="993" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Add" />
...@@ -299,24 +299,6 @@ ...@@ -299,24 +299,6 @@
<option name="myItemType" value="" /> <option name="myItemType" value="" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="KADMOS">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="pyKADMOS">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="KB_Sellar">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" /> <pane id="Scratches" />
...@@ -328,6 +310,7 @@ ...@@ -328,6 +310,7 @@
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.postfix.templates" /> <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.postfix.templates" />
<property name="settings.editor.splitter.proportion" value="0.2" /> <property name="settings.editor.splitter.proportion" value="0.2" />
<property name="ToolWindowRun.ShowToolbar" value="false" /> <property name="ToolWindowRun.ShowToolbar" value="false" />
<property name="FullScreen" value="true" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
...@@ -341,7 +324,7 @@ ...@@ -341,7 +324,7 @@
<recent name="$PROJECT_DIR$/pyKADMOS/old" /> <recent name="$PROJECT_DIR$/pyKADMOS/old" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Python.demo_OO"> <component name="RunManager" selected="Python.sellarProblem">
<configuration default="false" name="testPyGraphML" type="PythonConfigurationType" factoryName="Python" temporary="true"> <configuration default="false" name="testPyGraphML" type="PythonConfigurationType" factoryName="Python" temporary="true">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
...@@ -396,6 +379,24 @@ ...@@ -396,6 +379,24 @@
<option name="SHOW_COMMAND_LINE" value="false" /> <option name="SHOW_COMMAND_LINE" value="false" />
<method /> <method />
</configuration> </configuration>
<configuration default="false" name="sellarProblem" type="PythonConfigurationType" factoryName="Python" temporary="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/pyKADMOS" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<module name="KADMOS" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/pyKADMOS/sellarProblem.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<method />
</configuration>
<configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests"> <configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
...@@ -604,16 +605,18 @@ ...@@ -604,16 +605,18 @@
<option name="USE_KEYWORD" value="false" /> <option name="USE_KEYWORD" value="false" />
<method /> <method />
</configuration> </configuration>
<list size="3"> <list size="4">
<item index="0" class="java.lang.String" itemvalue="Python.testPyGraphML" /> <item index="0" class="java.lang.String" itemvalue="Python.testPyGraphML" />
<item index="1" class="java.lang.String" itemvalue="Python.demo" /> <item index="1" class="java.lang.String" itemvalue="Python.demo" />
<item index="2" class="java.lang.String" itemvalue="Python.demo_OO" /> <item index="2" class="java.lang.String" itemvalue="Python.demo_OO" />
<item index="3" class="java.lang.String" itemvalue="Python.sellarProblem" />
</list> </list>
<recent_temporary> <recent_temporary>
<list size="3"> <list size="4">
<item index="0" class="java.lang.String" itemvalue="Python.demo_OO" /> <item index="0" class="java.lang.String" itemvalue="Python.sellarProblem" />
<item index="1" class="java.lang.String" itemvalue="Python.demo" /> <item index="1" class="java.lang.String" itemvalue="Python.demo_OO" />
<item index="2" class="java.lang.String" itemvalue="Python.testPyGraphML" /> <item index="2" class="java.lang.String" itemvalue="Python.demo" />
<item index="3" class="java.lang.String" itemvalue="Python.testPyGraphML" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -633,19 +636,28 @@ ...@@ -633,19 +636,28 @@
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TodoView">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<is-autoscroll-to-source value="true" />
</todo-panel>
</component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1920" height="993" extended-state="6" /> <frame x="0" y="0" width="1280" height="800" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17552084" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18336026" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.49676898" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26948053" sideWeight="0.46458334" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4330601" sideWeight="0.4394184" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32575756" sideWeight="0.46875" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32465753" sideWeight="0.4628433" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.49676898" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26948053" sideWeight="0.53541666" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4330601" sideWeight="0.56058156" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32913843" sideWeight="0.49479166" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.49192247" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39906833" sideWeight="0.49453124" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39906833" sideWeight="0.49453124" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
...@@ -670,11 +682,21 @@ ...@@ -670,11 +682,21 @@
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
<option name="time" value="5" /> <option name="time" value="6" />
</breakpoint-manager> </breakpoint-manager>
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pyKADMOS/MDOproblem.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#9#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/MDOproblem.py"> <entry file="file://$PROJECT_DIR$/pyKADMOS/MDOproblem.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
...@@ -689,7 +711,6 @@ ...@@ -689,7 +711,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="705"> <state relative-caret-position="705">
<caret line="47" column="23" selection-start-line="47" selection-start-column="23" selection-end-line="47" selection-end-column="23" /> <caret line="47" column="23" selection-start-line="47" selection-start-column="23" selection-end-line="47" selection-end-column="23" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -697,7 +718,6 @@ ...@@ -697,7 +718,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="150">
<caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" /> <caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -705,7 +725,6 @@ ...@@ -705,7 +725,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -810,7 +829,6 @@ ...@@ -810,7 +829,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="150">
<caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" /> <caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -818,7 +836,6 @@ ...@@ -818,7 +836,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="135">
<caret line="9" column="14" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" /> <caret line="9" column="14" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -869,7 +886,6 @@ ...@@ -869,7 +886,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435"> <state relative-caret-position="435">
<caret line="29" column="6" selection-start-line="29" selection-start-column="6" selection-end-line="29" selection-end-column="6" /> <caret line="29" column="6" selection-start-line="29" selection-start-column="6" selection-end-line="29" selection-end-column="6" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -884,7 +900,6 @@ ...@@ -884,7 +900,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -892,15 +907,6 @@ ...@@ -892,15 +907,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="75">
<caret line="5" column="14" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" /> <caret line="5" column="14" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-input.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="42" selection-start-line="1" selection-start-column="42" selection-end-line="1" selection-end-column="42" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -908,7 +914,6 @@ ...@@ -908,7 +914,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="75">
<caret line="5" column="14" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" /> <caret line="5" column="14" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -916,15 +921,6 @@ ...@@ -916,15 +921,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="45">
<caret line="3" column="16" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="16" /> <caret line="3" column="16" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-output.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="26" selection-start-line="1" selection-start-column="26" selection-end-line="1" selection-end-column="26" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -932,7 +928,6 @@ ...@@ -932,7 +928,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="75">
<caret line="5" column="14" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" /> <caret line="5" column="14" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -943,18 +938,11 @@ ...@@ -943,18 +938,11 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/graphml_test.graphml"> <entry file="file://$PROJECT_DIR$/pyKADMOS/graphml_test.graphml" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/D2-input.xml"> <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/D2-input.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="60">
<caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" /> <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -962,7 +950,6 @@ ...@@ -962,7 +950,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="30">
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -991,7 +978,6 @@ ...@@ -991,7 +978,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="705"> <state relative-caret-position="705">
<caret line="47" column="23" selection-start-line="47" selection-start-column="23" selection-end-line="47" selection-end-column="23" /> <caret line="47" column="23" selection-start-line="47" selection-start-column="23" selection-end-line="47" selection-end-column="23" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -999,7 +985,6 @@ ...@@ -999,7 +985,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1007,7 +992,6 @@ ...@@ -1007,7 +992,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="150">
<caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" /> <caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1015,30 +999,41 @@ ...@@ -1015,30 +999,41 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/data_schema2.xsd"> <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/data_schema2.xsd" />
<entry file="file://$PROJECT_DIR$/pyKADMOS/utilities.py" />
<entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-input.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="60">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="4" column="12" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/utilities.py"> <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-output.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="60">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/sellarProblem.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="584">
<caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/MDOproblem.py"> <entry file="file://$PROJECT_DIR$/pyKADMOS/MDOproblem.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="422"> <state relative-caret-position="614">
<caret line="630" column="51" selection-start-line="630" selection-start-column="51" selection-end-line="630" selection-end-column="51" /> <caret line="701" column="70" selection-start-line="701" selection-start-column="70" selection-end-line="701" selection-end-column="70" />
<folding> <folding>
<element signature="e#0#9#0" expanded="true" /> <element signature="e#0#9#0" expanded="true" />
</folding> </folding>
......
pyKADMOS/MDOproblem.py
+ 159
− 97
View file @ 4c2fb9f2
This diff is collapsed.
pyKADMOS/MDOproblem.pyc 0 → 100644
+ 0
− 0
View file @ 4c2fb9f2
File added
pyKADMOS/sellarProblem.py 0 → 100644
+ 58
− 0
View file @ 4c2fb9f2
import pprint
import networkx as nx
from pyKADMOS.MDOproblem import MDOproblem
import matplotlib.pyplot as plt
sellarProblem = MDOproblem('KB_Sellar')
function_data = sellarProblem.analyze_function_xmls()
common_nodes = sellarProblem.get_common_nodes()
function_graph_D1 = sellarProblem.get_function_graph('D1')
function_graph_D2 = sellarProblem.get_function_graph('D2')
pp = pprint.PrettyPrinter(indent=4)
pp.pprint(function_data)
function_graph_D12 = nx.compose(function_graph_D1, function_graph_D2)
function_graphs = sellarProblem.get_function_graphs()
MCG = sellarProblem.get_MCG()
ext_MCG = sellarProblem.get_extended_MCG()
MCG_contracted_graph = sellarProblem.get_contracted_graph(MCG, 0)
adj_matrix = sellarProblem.get_adjacency_matrix(MCG)
sinks = ['/data_schema/analyses/f',
'/data_schema/analyses/g1',
'/data_schema/analyses/g2']
FPG1 = sellarProblem.get_FPG_based_on_sink(sinks[0])
FPG2 = sellarProblem.get_FPG_based_on_sinks(sinks)
FPG_contracted_graph = sellarProblem.get_contracted_graph(FPG1, 1)
G_print = FPG_contracted_graph
for node, data in G_print.nodes_iter(data=True):
print node
print data
print ' '
# Plots
sellarProblem.plot_graph(function_graph_D1, 1)
sellarProblem.plot_graph(function_graph_D12, 2)
sellarProblem.plot_graph(MCG, 3, color_setting='types')
sellarProblem.plot_graph(ext_MCG, 4)
sellarProblem.plot_graph(MCG_contracted_graph, 5, save_as='test')
sellarProblem.plot_graph(FPG2, 6, color_setting='sinks')
sellarProblem.plot_graph(FPG_contracted_graph, 7)
# # Adjacency matrix
print ' '
print 'Adjacency matrix:'
pp.pprint(adj_matrix['dict of dicts'])
plt.show()
print 'Done!'
#sellarProblem.save_as_graphml(MCG, 'test')
pyKADMOS/test.graphml 0 → 100644
+ 0
− 0
View file @ 4c2fb9f2
pyKADMOS/test.png 0 → 100644
+ 0
− 0
View file @ 4c2fb9f2
pyKADMOS/test.png

28.1 KiB

0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment