diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4170cbe691672d8501fe19d75633c996be9e6c1d..42c994135bb6a497fa19bcf2f2e14ea611a9b80d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,43 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d3e74292-1e1a-4cba-81b3-9c9d67f586ca" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/test_pymetis" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/CPACSdummyProblem.py" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/ACAERO-info.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/ACAERO-input.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/ACAERO-output.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_EM-info.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_EM-input.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_EM-output.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_FD-info.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_FD-input.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_FD-output.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMISSION-info.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMISSION-input.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMISSION-output.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMWET-info.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMWET-input.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMWET-output.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MASS-info.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MASS-input.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MASS-output.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MISSION-info.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MISSION-input.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MISSION-output.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/OBJ-info.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/OBJ-input.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/OBJ-output.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/PHALANX-info.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/PHALANX-input.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/PHALANX-output.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-info.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-input.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-output.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-info.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-input.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-output.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/data_schema.xsd" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/data_schema.xsd" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/data_schema.xsd" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/D1-input.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/D1-input.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/D10-input.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/D10-input.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/D2-input.xml" afterPath="$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/D2-input.xml" />
@@ -20,6 +52,7 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" afterPath="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/mathProblem.py" afterPath="$PROJECT_DIR$/pyKADMOS/mathProblem.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/sellarProblem.py" afterPath="$PROJECT_DIR$/pyKADMOS/sellarProblem.py" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/test_pymetis" afterPath="$PROJECT_DIR$/pyKADMOS/test_pymetis" />
</list>
<ignored path="KADMOS.iws" />
<ignored path=".idea/workspace.xml" />
@@ -36,10 +69,11 @@
<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_OO.coverage" NAME="demo_OO Coverage Results" MODIFIED="1463752104977" 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$mathProblem.coverage" NAME="mathProblem Coverage Results" MODIFIED="1463752138168" 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$mathProblem.coverage" NAME="mathProblem Coverage Results" MODIFIED="1463952245741" 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$CPACSdummyProblem.coverage" NAME="CPACSdummyProblem Coverage Results" MODIFIED="1464590024217" 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$bigMathProblem.coverage" NAME="bigMathProblem Coverage Results" MODIFIED="1463418247627" 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="1463826096546" 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$test_pymetis.coverage" NAME="test_pymetis Coverage Results" MODIFIED="1463755216754" 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="1463844059270" 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$test_pymetis.coverage" NAME="test_pymetis Coverage Results" MODIFIED="1463842497510" 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 name="CreatePatchCommitExecutor">
<option name="PATCH_PATH" value="" />
@@ -50,11 +84,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="MDOproblem.py" pinned="false" current-in-tab="false">
+ <file leaf-file-name="MDOproblem.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pyKADMOS/MDOproblem.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-485">
- <caret line="591" column="8" selection-start-line="591" selection-start-column="8" selection-end-line="591" selection-end-column="8" />
+ <state relative-caret-position="440">
+ <caret line="55" column="8" selection-start-line="55" selection-start-column="8" selection-end-line="55" selection-end-column="8" />
<folding>
<element signature="e#0#9#0" expanded="true" />
</folding>
@@ -62,23 +96,11 @@
</provider>
</entry>
</file>
- <file leaf-file-name="test_pymetis" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pyKADMOS/test_pymetis">
+ <file leaf-file-name="CPACSdummyProblem.py" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/CPACSdummyProblem.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#21#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="sellarProblem.py" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/pyKADMOS/sellarProblem.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="445">
- <caret line="69" column="0" selection-start-line="69" selection-start-column="0" selection-end-line="69" selection-end-column="0" />
+ <state relative-caret-position="770">
+ <caret line="115" column="34" selection-start-line="115" selection-start-column="34" selection-end-line="115" selection-end-column="34" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
@@ -101,20 +123,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/pyKADMOS/testPyGraphML.py" />
- <option value="$PROJECT_DIR$/pyKADMOS/Demo.py" />
- <option value="$PROJECT_DIR$/pyKADMOS/cpacslib.py" />
- <option value="$PROJECT_DIR$/pyKADMOS/demo_schema.xsd" />
- <option value="$PROJECT_DIR$/pyKADMOS/D1.xml" />
- <option value="$PROJECT_DIR$/pyKADMOS/D2.xml" />
- <option value="$PROJECT_DIR$/pyKADMOS/D1-input.xml" />
- <option value="$PROJECT_DIR$/pyKADMOS/data_schema.xsd" />
- <option value="$PROJECT_DIR$/pyKADMOS/D1-output.xml" />
- <option value="$PROJECT_DIR$/pyKADMOS/G1-input.xml" />
- <option value="$PROJECT_DIR$/pyKADMOS/G1-output.xml" />
- <option value="$PROJECT_DIR$/pyKADMOS/G2-input.xml" />
- <option value="$PROJECT_DIR$/pyKADMOS/G2-output.xml" />
- <option value="$PROJECT_DIR$/pyKADMOS/F-input.xml" />
<option value="$PROJECT_DIR$/pyKADMOS/F-output.xml" />
<option value="$PROJECT_DIR$/pyKADMOS/demo.py" />
<option value="$PROJECT_DIR$/pyKADMOS/D2-input.xml" />
@@ -123,14 +131,49 @@
<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/KB_Sellar/data_schema.xsd" />
<option value="$PROJECT_DIR$/pyKADMOS/bigMathProblem.py" />
<option value="$PROJECT_DIR$/pyKADMOS/create_math_problem.py" />
- <option value="$PROJECT_DIR$/pyKADMOS/mathProblem.py" />
- <option value="/usr/local/lib/python2.7/site-packages/metis.py" />
<option value="$PROJECT_DIR$/pyKADMOS/test_pymetis" />
- <option value="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" />
+ <option value="/usr/local/lib/python2.7/site-packages/metis.py" />
<option value="$PROJECT_DIR$/pyKADMOS/sellarProblem.py" />
+ <option value="$PROJECT_DIR$/pyKADMOS/mathProblem.py" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_Sellar/data_schema.xsd" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/PHALANX-output.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/PHALANX-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_FD-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_FD-input.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/OBJ-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/OBJ-output.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_FD-output.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMISSION-input.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMISSION-output.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMISSION-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MISSION-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_EM-input.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_EM-output.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_EM-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/PHALANX-input.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/OBJ-input.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MASS-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MASS-input.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-input.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMWET-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMWET-input.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMWET-output.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/ACAERO-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-output.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/ACAERO-output.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MISSION-output.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MISSION-input.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/data_schema.xsd" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/ACAERO-input.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-input.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-output.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MASS-output.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/CPACSdummyProblem.py" />
+ <option value="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" />
</list>
</option>
</component>
@@ -142,8 +185,8 @@
</component>
<component name="ProjectFrameBounds">
<option name="y" value="23" />
- <option name="width" value="1280" />
- <option name="height" value="713" />
+ <option name="width" value="1920" />
+ <option name="height" value="993" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
@@ -189,6 +232,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -329,7 +373,6 @@
</PATH>
</subPane>
</pane>
- <pane id="Scratches" />
<pane id="Scope">
<subPane subId="Project Files">
<PATH>
@@ -356,6 +399,24 @@
<option name="myItemType" value="" />
</PATH_ELEMENT>
</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_CPACS_dummy">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</pane>
</panes>
@@ -369,17 +430,19 @@
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy" />
+ <recent name="$PROJECT_DIR$/pyKADMOS/sleeve" />
<recent name="$PROJECT_DIR$/pyKADMOS/KB_Sellar" />
<recent name="$PROJECT_DIR$/pyKADMOS" />
<recent name="$PROJECT_DIR$/pyKADMOS/KB_CPACS" />
- <recent name="$PROJECT_DIR$/pyKADMOS/old" />
</key>
<key name="CopyFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy" />
<recent name="$PROJECT_DIR$/pyKADMOS/KB_Sellar" />
<recent name="$PROJECT_DIR$/pyKADMOS" />
</key>
</component>
- <component name="RunManager" selected="Python.sellarProblem">
+ <component name="RunManager" selected="Python.CPACSdummyProblem">
<configuration default="false" name="demo_OO" type="PythonConfigurationType" factoryName="Python" temporary="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
@@ -416,7 +479,7 @@
<option name="SHOW_COMMAND_LINE" value="false" />
<method />
</configuration>
- <configuration default="false" name="bigMathProblem" type="PythonConfigurationType" factoryName="Python" temporary="true">
+ <configuration default="false" name="mathProblem" type="PythonConfigurationType" factoryName="Python" temporary="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
@@ -429,12 +492,12 @@
<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/create_math_problem.py" />
+ <option name="SCRIPT_NAME" value="$PROJECT_DIR$/pyKADMOS/mathProblem.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<method />
</configuration>
- <configuration default="false" name="mathProblem" type="PythonConfigurationType" factoryName="Python" temporary="true">
+ <configuration default="false" name="test_pymetis" type="PythonConfigurationType" factoryName="Python" temporary="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
@@ -447,12 +510,12 @@
<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/mathProblem.py" />
+ <option name="SCRIPT_NAME" value="$PROJECT_DIR$/pyKADMOS/test_pymetis" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<method />
</configuration>
- <configuration default="false" name="test_pymetis" type="PythonConfigurationType" factoryName="Python" temporary="true">
+ <configuration default="false" name="CPACSdummyProblem" type="PythonConfigurationType" factoryName="Python" temporary="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
@@ -465,7 +528,7 @@
<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/test_pymetis" />
+ <option name="SCRIPT_NAME" value="$PROJECT_DIR$/pyKADMOS/CPACSdummyProblem.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<method />
@@ -681,17 +744,17 @@
<list size="5">
<item index="0" class="java.lang.String" itemvalue="Python.demo_OO" />
<item index="1" class="java.lang.String" itemvalue="Python.sellarProblem" />
- <item index="2" class="java.lang.String" itemvalue="Python.bigMathProblem" />
- <item index="3" class="java.lang.String" itemvalue="Python.mathProblem" />
- <item index="4" class="java.lang.String" itemvalue="Python.test_pymetis" />
+ <item index="2" class="java.lang.String" itemvalue="Python.mathProblem" />
+ <item index="3" class="java.lang.String" itemvalue="Python.test_pymetis" />
+ <item index="4" class="java.lang.String" itemvalue="Python.CPACSdummyProblem" />
</list>
<recent_temporary>
<list size="5">
- <item index="0" class="java.lang.String" itemvalue="Python.sellarProblem" />
- <item index="1" class="java.lang.String" itemvalue="Python.test_pymetis" />
- <item index="2" class="java.lang.String" itemvalue="Python.mathProblem" />
- <item index="3" class="java.lang.String" itemvalue="Python.demo_OO" />
- <item index="4" class="java.lang.String" itemvalue="Python.bigMathProblem" />
+ <item index="0" class="java.lang.String" itemvalue="Python.CPACSdummyProblem" />
+ <item index="1" class="java.lang.String" itemvalue="Python.mathProblem" />
+ <item index="2" class="java.lang.String" itemvalue="Python.sellarProblem" />
+ <item index="3" class="java.lang.String" itemvalue="Python.test_pymetis" />
+ <item index="4" class="java.lang.String" itemvalue="Python.demo_OO" />
</list>
</recent_temporary>
</component>
@@ -721,20 +784,20 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="23" width="1280" height="713" extended-state="6" />
- <editor active="true" />
+ <frame x="0" y="23" width="1920" height="993" extended-state="6" />
+ <editor active="false" />
<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.14620355" 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.17518637" 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.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="false" show_stripe_button="true" weight="0.4328524" 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="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32423756" 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.32876712" sideWeight="0.49676898" order="7" 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.2423756" 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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32747602" sideWeight="0.49192247" order="7" 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.4429679" 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.24959612" 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.32668883" 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="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.3986711" 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="Message" 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="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -743,6 +806,26 @@
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32720232" sideWeight="0.47916666" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" 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" />
</layout>
+ <layout-to-restore>
+ <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="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="Message" 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="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" 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.4328524" sideWeight="0.4394184" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" 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.32423756" sideWeight="0.4628433" order="8" 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="9" 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.28502417" sideWeight="0.56058156" order="2" 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.32747602" sideWeight="0.49192247" order="10" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15347335" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+ <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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32720232" sideWeight="0.47916666" 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="Ant Build" active="false" anchor="right" 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="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" />
+ </layout-to-restore>
</component>
<component name="Vcs.Log.UiProperties">
<option name="RECENTLY_FILTERED_USER_GROUPS">
@@ -762,319 +845,385 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/pyKADMOS/CPACS_23/lib/Python/cpacslib.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/G2-input.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1260">
- <caret line="84" column="0" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="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" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/Library/Caches/PyCharm2016.1/python_stubs/120269359/exceptions.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-output.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="287">
- <caret line="148" column="6" selection-start-line="148" selection-start-column="6" selection-end-line="148" selection-end-column="6" />
+ <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/cpacslib.py" />
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS/D150_fake.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-input.xml">
<provider selected="true" editor-type-id="text-editor">
- <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" />
+ <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://$APPLICATION_HOME_DIR$/helpers/pydev/pydevd.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/F-output.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="175">
- <caret line="937" column="0" selection-start-line="937" selection-start-column="0" selection-end-line="937" selection-end-column="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" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS/AGILE_DC1_L0_MDA.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/F-input.xml">
<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:///usr/local/lib/python2.7/site-packages/networkx/algorithms/operators/binary.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/create_math_problem.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="138">
- <caret line="291" column="4" selection-start-line="291" selection-start-column="4" selection-end-line="291" selection-end-column="4" />
+ <state relative-caret-position="225">
+ <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/graphml_test.graphml" />
- <entry file="file:///usr/local/lib/python2.7/site-packages/networkx/classes/digraph.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/D1-input.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-115">
- <caret line="1274" column="8" selection-start-line="1274" selection-start-column="8" selection-end-line="1274" selection-end-column="8" />
+ <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" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/old/demo.py">
+ <entry file="file:///usr/local/lib/python2.7/site-packages/pymetis/__init__.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3870">
- <caret line="258" column="0" selection-start-line="258" selection-start-column="0" selection-end-line="258" selection-end-column="0" />
+ <state relative-caret-position="495">
+ <caret line="33" column="0" selection-start-line="33" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS/cpacs_schema.xsd">
+ <entry file="file:///usr/local/lib/python2.7/site-packages/metis.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" />
+ <state relative-caret-position="15">
+ <caret line="688" column="49" selection-start-line="688" selection-start-column="49" selection-end-line="688" selection-end-column="49" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/__init__.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/test_pymetis">
<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 relative-caret-position="240">
+ <caret line="16" column="64" selection-start-line="16" selection-start-column="64" selection-end-line="16" selection-end-column="64" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/data_schema2.xsd" />
- <entry file="file://$PROJECT_DIR$/pyKADMOS/utilities.py" />
- <entry file="file:///usr/local/lib/python2.7/site-packages/matplotlib/pyplot.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/mathProblem.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="306">
- <caret line="3006" column="13" selection-start-line="3006" selection-start-column="13" selection-end-line="3006" selection-end-column="13" />
+ <state relative-caret-position="475">
+ <caret line="40" column="0" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file:///usr/local/Cellar/python/2.7.11/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/scipy/sparse/coo.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/data_schema.xsd">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="291">
- <caret line="247" column="8" selection-start-line="247" selection-start-column="8" selection-end-line="247" selection-end-column="8" />
+ <state relative-caret-position="-225">
+ <caret line="263" column="9" selection-start-line="263" selection-start-column="9" selection-end-line="263" selection-end-column="9" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/test.png">
- <provider selected="true" editor-type-id="images">
- <state />
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/data_schema.xsd">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="90">
+ <caret line="6" column="41" selection-start-line="6" selection-start-column="41" selection-end-line="6" selection-end-column="41" />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/D2-output.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/D1-input.xml">
<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 relative-caret-position="539">
+ <caret line="68" column="14" selection-start-line="0" selection-start-column="0" selection-end-line="68" selection-end-column="14" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/testing.xml" />
- <entry file="file://$PROJECT_DIR$/pyKADMOS/testing.xsd" />
- <entry file="file://$PROJECT_DIR$/pyKADMOS/testing_auto.xsd" />
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/Y11-output.xml" />
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/C3-output.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_FD-input.xml">
<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 relative-caret-position="60">
+ <caret line="4" column="29" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/C2-output.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/OBJ-info.json">
<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 relative-caret-position="75">
+ <caret line="5" column="37" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="37" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/D3-input.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_EM-output.xml">
<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 relative-caret-position="60">
+ <caret line="4" column="18" selection-start-line="4" selection-start-column="18" selection-end-line="4" selection-end-column="18" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/C2-input.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_EM-input.xml">
<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 />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/C3-input.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_FD-info.json">
<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_big_math_problem/F-input.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_EM-info.json">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="15">
- <caret line="1" column="48" selection-start-line="1" selection-start-column="48" selection-end-line="1" selection-end-column="48" />
+ <state relative-caret-position="75">
+ <caret line="5" column="33" selection-start-line="5" selection-start-column="33" selection-end-line="5" selection-end-column="33" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/data_schema.xsd">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MISSION-info.json">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="6" column="19" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
+ <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_big_math_problem/D2-input.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MASS-info.json">
<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 relative-caret-position="75">
+ <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/D1-output.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMISSION-info.json">
<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/D1-output.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/OBJ-input.xml">
<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 />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/D2-input.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMISSION-output.xml">
<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 />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/D1-input.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MASS-input.xml">
<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 relative-caret-position="75">
+ <caret line="5" column="13" selection-start-line="2" selection-start-column="2" selection-end-line="5" selection-end-column="13" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/C1-output.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/PHALANX-info.json">
<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_big_math_problem/C1-input.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-info.json">
<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 relative-caret-position="75">
+ <caret line="5" column="37" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="37" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/G2-output.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMWET-info.json">
<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/G2-input.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/ACAERO-info.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="5" column="37" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="37" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMISSION-input.xml">
<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 />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-output.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MISSION-output.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="90">
+ <caret line="6" column="14" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MISSION-input.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="5" column="2" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="2" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-output.xml">
<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/G1-input.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/data_schema.xsd">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="240">
+ <caret line="49" column="19" selection-start-line="49" selection-start-column="19" selection-end-line="49" selection-end-column="19" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/PHALANX-input.xml">
<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/F-output.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMWET-input.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-input.xml">
<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/F-input.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-input.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="15">
+ <caret line="1" column="32" selection-start-line="1" selection-start-column="32" selection-end-line="1" selection-end-column="32" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-output.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="15">
+ <caret line="1" column="32" selection-start-line="1" selection-start-column="32" selection-end-line="1" selection-end-column="32" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-info.json">
<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/create_math_problem.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MASS-output.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
+ <state relative-caret-position="60">
+ <caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/data_schema.xsd">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/ACAERO-input.xml">
<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 />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/D1-input.xml">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/ACAERO-output.xml">
<provider selected="true" editor-type-id="text-editor">
- <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" />
+ <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 />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/mathProblem.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMWET-output.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="345">
- <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="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" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file:///usr/local/lib/python2.7/site-packages/pymetis/__init__.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/sellarProblem.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="495">
- <caret line="33" column="0" selection-start-line="33" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+ <state relative-caret-position="380">
+ <caret line="34" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+ <folding>
+ <element signature="e#0#13#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file:///usr/local/lib/python2.7/site-packages/metis.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/OBJ-output.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-15">
- <caret line="802" column="47" selection-start-line="802" selection-start-column="47" selection-end-line="802" selection-end-column="47" />
+ <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 />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/test_pymetis">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/PHALANX-output.xml">
<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#21#0" expanded="true" />
- </folding>
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/MDOproblem.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_FD-output.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-485">
- <caret line="591" column="8" selection-start-line="591" selection-start-column="8" selection-end-line="591" selection-end-column="8" />
+ <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 />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/CPACSdummyProblem.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="770">
+ <caret line="115" column="34" selection-start-line="115" selection-start-column="34" selection-end-line="115" selection-end-column="34" />
<folding>
- <element signature="e#0#9#0" expanded="true" />
+ <element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/sellarProblem.py">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/MDOproblem.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="445">
- <caret line="69" column="0" selection-start-line="69" selection-start-column="0" selection-end-line="69" selection-end-column="0" />
+ <state relative-caret-position="440">
+ <caret line="55" column="8" selection-start-line="55" selection-start-column="8" selection-end-line="55" selection-end-column="8" />
<folding>
- <element signature="e#0#13#0" expanded="true" />
+ <element signature="e#0#9#0" expanded="true" />
</folding>
</state>
</provider>
diff --git a/pyKADMOS/CPACSdummyProblem.py b/pyKADMOS/CPACSdummyProblem.py
new file mode 100644
index 0000000000000000000000000000000000000000..fca79a0ca8d3aa29fcb8ae3a936e660fd3f82dd6
--- /dev/null
+++ b/pyKADMOS/CPACSdummyProblem.py
@@ -0,0 +1,120 @@
+import pprint
+
+import networkx as nx
+
+from pyKADMOS.MDOproblem import MDOproblem
+
+import matplotlib.pyplot as plt
+
+# Settings
+fig_size_laptop = (13,6)
+fig_size_screen = (18,11)
+fig_size = fig_size_screen
+
+# Show knowledge base
+# # dummy CPACS schema
+# # TODO open schema tree
+# # info json file
+# # input xml
+# # output xml
+
+# Load KB as MDO problem
+exampleProblem = MDOproblem('KB_CPACS_dummy')
+
+# Print function data
+function_data = exampleProblem.analyze_function_xmls()
+pp = pprint.PrettyPrinter(indent=4)
+print ''
+print '-----------------'
+print ' FUNCTION DATA '
+print '-----------------'
+pp.pprint(function_data)
+
+# Graph of one function
+function_graph_tool = exampleProblem.get_function_graph('PHALANX')
+exampleProblem.plot_graph(function_graph_tool, 1, fig_size=fig_size, color_setting='default')
+# exampleProblem.plot_graph(function_graph_tool, 2, fig_size=fig_size, color_setting='types')
+
+# Graph of two functions
+function_graph_tool2 = exampleProblem.get_function_graph('MASS')
+combination_graph = nx.compose(function_graph_tool,function_graph_tool2)
+exampleProblem.plot_graph(combination_graph, 3, fig_size=fig_size, color_setting='default')
+# exampleProblem.plot_graph(combination_graph, 4, fig_size=fig_size, color_setting='types')
+
+# # Node grouping for categorization
+groups = exampleProblem.get_grouped_graph_nodes(combination_graph)
+print ''
+print '-----------------'
+print ' NODE GROUPING '
+print '-----------------'
+pp.pprint(groups)
+
+# # Node contracting according to data schema
+contracted_graph = exampleProblem.get_contracted_graph(combination_graph, 1)
+exampleProblem.plot_graph(contracted_graph, 5, fig_size=fig_size, color_setting='default')
+# TODO: Adjust level to 0!
+
+# # MCG
+# On to the graph of the complete knowledge base: MCG
+MCG = exampleProblem.get_MCG()
+exampleProblem.plot_graph(MCG, 6, color_setting='types', fig_size=fig_size)
+exampleProblem.plot_graph(exampleProblem.get_contracted_graph(MCG, 1), 7, color_setting='default', fig_size=fig_size)
+
+# TODO: inspect knowledge base and expected inputs / outputs
+# TODO: add ACAERO tool
+
+# Visualization with adjacency matrix
+print ''
+print '-----------------'
+print 'ADJACENCY MATRIX '
+print '-----------------'
+adj_matrix = exampleProblem.get_adjacency_matrix(MCG)
+pp.pprint(adj_matrix['dict of dicts'])
+exampleProblem.draw_adjacency_matrix(MCG, fig_num=8, fig_size=fig_size)
+
+# Node grouping for categorization
+MCG_groups = exampleProblem.get_grouped_graph_nodes(MCG)
+print ''
+print '-----------------'
+print 'NODE GROUPING MCG'
+print '-----------------'
+pp.pprint(MCG_groups)
+
+
+# # FPG
+# Now let's try to create the fundamental problem
+# First let's assume I only want to have the mass of the wing
+node_m_wing = '/data_schema/analyses/m_wing'
+
+FPG = exampleProblem.get_FPG_based_on_sink(node_m_wing)
+exampleProblem.plot_graph(FPG, 9, color_setting='sinks', fig_size=fig_size)
+
+# Or let's use a group of sinks as objective and constraints
+sinks = ['/data_schema/MDO_data/obj',
+ '/data_schema/MDO_data/con_FD_OEI',
+ '/data_schema/MDO_data/con_FD_MLF']
+FPG2 = exampleProblem.get_FPG_based_on_sinks(sinks)
+exampleProblem.plot_graph(FPG2, 10, color_setting='sinks', fig_size=fig_size)
+
+# Visualization with adjacency matrix
+print ''
+print '-----------------'
+print 'ADJACENCY MATRIX '
+print '-----------------'
+adj_matrix = exampleProblem.get_adjacency_matrix(FPG2)
+pp.pprint(adj_matrix['dict of dicts'])
+exampleProblem.draw_adjacency_matrix(FPG2, fig_num=11, fig_size=fig_size)
+
+# Analysis of graph
+print ''
+print '-----------------'
+print ' CYCLES '
+print '-----------------'
+cycles = list(nx.simple_cycles(FPG2))
+pp.pprint(cycles)
+
+# Graph partitioning based on info
+
+
+# Don't close the plots!
+plt.show()
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/ACAERO-info.json b/pyKADMOS/KB_CPACS_dummy/ACAERO-info.json
new file mode 100644
index 0000000000000000000000000000000000000000..ab751566fdc30b203fee96f4da8b6ab581c18b46
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/ACAERO-info.json
@@ -0,0 +1,6 @@
+{"general_info":{"name":"Aircraft aerodynamic performance",
+ "version":1.0,
+ "creator":"Mengmeng Zhang",
+ "fidelity level":"L1"},
+ "executing_info":{"run time (s)":20,
+ "precision":0.05}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/ACAERO-input.xml b/pyKADMOS/KB_CPACS_dummy/ACAERO-input.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8019b9ee88eae0b0eadd381914bd90c6c2da0901
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/ACAERO-input.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="ACAERO" in_or_output="input">
+ <aircraft>
+ <wing_AR>42.0</wing_AR>
+ <wing_MAC>42.0</wing_MAC>
+ <wing_span>42.0</wing_span>
+ <fus_l>42.0</fus_l>
+ <fus_d>42.0</fus_d>
+ </aircraft>
+ <analyses>
+ <C_L_w>42.0</C_L_w>
+ <C_D_w>42.0</C_D_w>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/ACAERO-output.xml b/pyKADMOS/KB_CPACS_dummy/ACAERO-output.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f235bcb2d60f82d466507db2bd978b6e389ed775
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/ACAERO-output.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="ACAERO" in_or_output="input">
+ <analyses>
+ <C_L>42.0</C_L>
+ <C_D>42.0</C_D>
+ <cntrl_der>42.0</cntrl_der>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/CON_EM-info.json b/pyKADMOS/KB_CPACS_dummy/CON_EM-info.json
new file mode 100644
index 0000000000000000000000000000000000000000..789a33d7548ccc733cb19aa3a3e203c90eb1db93
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/CON_EM-info.json
@@ -0,0 +1,6 @@
+{"general_info":{"name":"Emission constraints",
+ "version":1.0,
+ "creator":"Imco van Gent",
+ "fidelity level":"NA"},
+ "executing_info":{"run time (s)":0.1,
+ "precision":1.00}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/CON_EM-input.xml b/pyKADMOS/KB_CPACS_dummy/CON_EM-input.xml
new file mode 100644
index 0000000000000000000000000000000000000000..925f25172ed0aa7da931d8b3353678aa53b48555
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/CON_EM-input.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="CON_EM" in_or_output="input">
+ <analyses>
+ <em_CO2>42.0</em_CO2>
+ <em_NOX>42.0</em_NOX>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/CON_EM-output.xml b/pyKADMOS/KB_CPACS_dummy/CON_EM-output.xml
new file mode 100644
index 0000000000000000000000000000000000000000..011a84425540c09eea19be23f46325d425b21f7b
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/CON_EM-output.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="CON_EM" in_or_output="input">
+ <MDO_data>
+ <con_EM_CO2>42.0</con_EM_CO2>
+ <con_EM_NOX>42.0</con_EM_NOX>
+ </MDO_data>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/CON_FD-info.json b/pyKADMOS/KB_CPACS_dummy/CON_FD-info.json
new file mode 100644
index 0000000000000000000000000000000000000000..cba07b3f91a94e433b6f260a0137af092acd53a3
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/CON_FD-info.json
@@ -0,0 +1,6 @@
+{"general_info":{"name":"Flight dynamics constraints",
+ "version":1.0,
+ "creator":"Imco van Gent",
+ "fidelity level":"NA"},
+ "executing_info":{"run time (s)":0.1,
+ "precision":1.00}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/CON_FD-input.xml b/pyKADMOS/KB_CPACS_dummy/CON_FD-input.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8ed9a3c4fba08cda66d0943d8951a3e27b9c9b8b
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/CON_FD-input.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="CON_FD" in_or_output="input">
+ <analyses>
+ <max_load_fac>42.0</max_load_fac>
+ <char_OEI>42.0</char_OEI>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/CON_FD-output.xml b/pyKADMOS/KB_CPACS_dummy/CON_FD-output.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ad31cc45407f66b58a711de179cf6b27a6930ce9
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/CON_FD-output.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="CON_FD" in_or_output="output">
+ <MDO_data>
+ <con_FD_OEI>42.0</con_FD_OEI>
+ <con_FD_MLF>42.0</con_FD_MLF>
+ </MDO_data>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/EMISSION-info.json b/pyKADMOS/KB_CPACS_dummy/EMISSION-info.json
new file mode 100644
index 0000000000000000000000000000000000000000..6f581b6c82c5e8cf3b91ad295e1ed1d164053759
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/EMISSION-info.json
@@ -0,0 +1,6 @@
+{"general_info":{"name":"EMISSION",
+ "version":1.0,
+ "creator":"Benedikt Aigner",
+ "fidelity level":"L2"},
+ "executing_info":{"run time (s)":3,
+ "precision":0.05}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/EMISSION-input.xml b/pyKADMOS/KB_CPACS_dummy/EMISSION-input.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1a0a621a1bf5b1c687d12a3806cd12a84bc79986
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/EMISSION-input.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="EMISSION" in_or_output="input">
+ <analyses>
+ <eng_T>42.0</eng_T>
+ <flight_data>42.0</flight_data>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/EMISSION-output.xml b/pyKADMOS/KB_CPACS_dummy/EMISSION-output.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f8db67ecfa25a7d07fe924240d421d1476f130e3
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/EMISSION-output.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="EMISSION" in_or_output="output">
+ <analyses>
+ <em_NOX>42.0</em_NOX>
+ <em_CO2>42.0</em_CO2>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/EMWET-info.json b/pyKADMOS/KB_CPACS_dummy/EMWET-info.json
new file mode 100644
index 0000000000000000000000000000000000000000..477607713133e5597333f9c59f8e96252187b631
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/EMWET-info.json
@@ -0,0 +1,6 @@
+{"general_info":{"name":"EMWET",
+ "version":1.0,
+ "creator":"Ali Elham",
+ "fidelity level":"L1"},
+ "executing_info":{"run time (s)":2,
+ "precision":0.05}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/EMWET-input.xml b/pyKADMOS/KB_CPACS_dummy/EMWET-input.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c2cd08bf69688c98541a437aa0c20518f555c219
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/EMWET-input.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="EMWET" in_or_output="input">
+ <aircraft>
+ <wing_AR>42.0</wing_AR>
+ <wing_MAC>42.0</wing_MAC>
+ <wing_span>42.0</wing_span>
+ </aircraft>
+ <analyses>
+ <aero_loads>42.0</aero_loads>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/EMWET-output.xml b/pyKADMOS/KB_CPACS_dummy/EMWET-output.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6c5f285a8a766558d7c4034e1987df02a2b1c0bf
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/EMWET-output.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="EMWET" in_or_output="output">
+ <analyses>
+ <m_wing>42.0</m_wing>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/MASS-info.json b/pyKADMOS/KB_CPACS_dummy/MASS-info.json
new file mode 100644
index 0000000000000000000000000000000000000000..16273116092c0f51aca6e8bdfd4465d0d24997ba
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/MASS-info.json
@@ -0,0 +1,6 @@
+{"general_info":{"name":"MASS",
+ "version":1.0,
+ "creator":"Marco Fioriti",
+ "fidelity level":"L1"},
+ "executing_info":{"run time (s)":0.5,
+ "precision":0.05}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/MASS-input.xml b/pyKADMOS/KB_CPACS_dummy/MASS-input.xml
new file mode 100644
index 0000000000000000000000000000000000000000..76c2379ecd86f56fce21d94aae667fbad7618f50
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/MASS-input.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="MASS" in_or_output="input">
+ <aircraft>
+ <fus_l>42.0</fus_l>
+ <fus_d>42.0</fus_d>
+ </aircraft>
+ <analyses>
+ <m_wing>42.0</m_wing>
+ <m_fuel>42.0</m_fuel>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/MASS-output.xml b/pyKADMOS/KB_CPACS_dummy/MASS-output.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ad9395b7985db2458b58ddd516082f5469967dee
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/MASS-output.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="MASS" in_or_output="output">
+ <analyses>
+ <m_MTOW>42.0</m_MTOW>
+ <max_load_fac>42.0</max_load_fac>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/MISSION-info.json b/pyKADMOS/KB_CPACS_dummy/MISSION-info.json
new file mode 100644
index 0000000000000000000000000000000000000000..ebfd566ce13f741bc8913f818486785175b6731b
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/MISSION-info.json
@@ -0,0 +1,6 @@
+{"general_info":{"name":"MISSION",
+ "version":1.0,
+ "creator":"Pier Davide Ciampa",
+ "fidelity level":"L0"},
+ "executing_info":{"run time (s)":30,
+ "precision":0.05}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/MISSION-input.xml b/pyKADMOS/KB_CPACS_dummy/MISSION-input.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5ff196d37933411c0af1f5dc3704945e6fda7eb7
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/MISSION-input.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="MISSION" in_or_output="input">
+ <aircraft>
+ <range>42.0</range>
+ </aircraft>
+ <analyses>
+ <eng_T>42.0</eng_T>
+ <C_L>42.0</C_L>
+ <C_D>42.0</C_D>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/MISSION-output.xml b/pyKADMOS/KB_CPACS_dummy/MISSION-output.xml
new file mode 100644
index 0000000000000000000000000000000000000000..04ad254c9d27bed9b9c3bde8cce2b4fbb852e2c7
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/MISSION-output.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="MISSION" in_or_output="output">
+ <analyses>
+ <m_fuel>42.0</m_fuel>
+ <flight_data>42.0</flight_data>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/OBJ-info.json b/pyKADMOS/KB_CPACS_dummy/OBJ-info.json
new file mode 100644
index 0000000000000000000000000000000000000000..fdecd0b0d29999dcaacdbc78afd0065e4ab5b146
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/OBJ-info.json
@@ -0,0 +1,6 @@
+{"general_info":{"name":"Objective function",
+ "version":1.0,
+ "creator":"Imco van Gent",
+ "fidelity level":"NA"},
+ "executing_info":{"run time (s)":0.1,
+ "precision":1.00}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/OBJ-input.xml b/pyKADMOS/KB_CPACS_dummy/OBJ-input.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8fa65329996ab3e29558e6db838e131ee25d7f90
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/OBJ-input.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="OBJ" in_or_output="input">
+ <analyses>
+ <m_MTOW>42.0</m_MTOW>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/OBJ-output.xml b/pyKADMOS/KB_CPACS_dummy/OBJ-output.xml
new file mode 100644
index 0000000000000000000000000000000000000000..599ed8e0141e5629e4d0f18e92bdf425bb5cf107
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/OBJ-output.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="OBJ" in_or_output="output">
+ <MDO_data>
+ <obj>42.0</obj>
+ </MDO_data>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/PHALANX-info.json b/pyKADMOS/KB_CPACS_dummy/PHALANX-info.json
new file mode 100644
index 0000000000000000000000000000000000000000..b5e34e0d3b5749f737e0a30379adb7f24714331d
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/PHALANX-info.json
@@ -0,0 +1,6 @@
+{"general_info":{"name":"PHALANX",
+ "version":1.0,
+ "creator":"Mark Voskuijl",
+ "fidelity level":"L1"},
+ "executing_info":{"run time (s)":60,
+ "precision":0.05}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/PHALANX-input.xml b/pyKADMOS/KB_CPACS_dummy/PHALANX-input.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e4600266f624f414dbf44eade38a9498a0963cb6
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/PHALANX-input.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="PHALANX" in_or_output="input">
+ <aircraft>
+ <wing_AR>42.0</wing_AR>
+ <wing_span>42.0</wing_span>
+ <wing_MAC>42.0</wing_MAC>
+ <fus_l>42.0</fus_l>
+ <fus_d>42.0</fus_d>
+ </aircraft>
+ <analyses>
+ <eng_T>42.0</eng_T>
+ <cntrl_der>42.0</cntrl_der>
+ <flight_data>42.0</flight_data>
+ <m_MTOW>42.0</m_MTOW>
+ <inertia_MTOW>42.0</inertia_MTOW>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/PHALANX-output.xml b/pyKADMOS/KB_CPACS_dummy/PHALANX-output.xml
new file mode 100644
index 0000000000000000000000000000000000000000..43e45bd9dba5197087998f44c36a4784ca4dbd22
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/PHALANX-output.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="PHALANX" in_or_output="output">
+ <analyses>
+ <max_load_fac>42.0</max_load_fac>
+ <char_OEI>42.0</char_OEI>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-info.json b/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-info.json
new file mode 100644
index 0000000000000000000000000000000000000000..f29ca203752a237b6c7839240939db58faf20b0c
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-info.json
@@ -0,0 +1,6 @@
+{"general_info":{"name":"Q3D",
+ "version":1.0,
+ "creator":"Ali Elham",
+ "fidelity level":"L1"},
+ "executing_info":{"run time (s)":5,
+ "precision":0.05}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-input.xml b/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-input.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d2eeb467e94d46d1046dd6aa1f2d13bd98251326
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-input.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="Q3D_LOAD" in_or_output="input">
+ <aircraft>
+ <wing_AR>42.0</wing_AR>
+ <wing_MAC>42.0</wing_MAC>
+ <wing_span>42.0</wing_span>
+ </aircraft>
+ <analyses>
+ <flight_data>42.0</flight_data>
+ <m_MTOW>42.0</m_MTOW>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-output.xml b/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-output.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6616d6a7a2a07e55259d9d0a0cc135dd4718f063
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/Q3D_LOAD-output.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="Q3D_LOAD" in_or_output="output">
+ <analyses>
+ <aero_loads>42.0</aero_loads>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-info.json b/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-info.json
new file mode 100644
index 0000000000000000000000000000000000000000..5f7b892e1a6fd7bd77695bf7c44f7e4f88e113b1
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-info.json
@@ -0,0 +1,6 @@
+{"general_info":{"name":"Q3D",
+ "version":1.0,
+ "creator":"Ali Elham",
+ "fidelity level":"L1"},
+ "executing_info":{"run time (s)":20,
+ "precision":0.05}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-input.xml b/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-input.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b5413b9506c1379108096ec24f4e66535a5c9643
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-input.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="Q3D_PERF" in_or_output="input">
+ <aircraft>
+ <wing_AR>42.0</wing_AR>
+ <wing_MAC>42.0</wing_MAC>
+ <wing_span>42.0</wing_span>
+ </aircraft>
+ <analyses>
+ <flight_data>42.0</flight_data>
+ <m_MTOW>42.0</m_MTOW>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-output.xml b/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-output.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2f0d67afb25421888f80e54ca3bba17ec70e8bd8
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/Q3D_PERF-output.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data_schema tool_name="Q3D_PERF" in_or_output="output">
+ <analyses>
+ <C_L_w>42.0</C_L_w>
+ <C_D_w>42.0</C_D_w>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_CPACS_dummy/data_schema.xsd b/pyKADMOS/KB_CPACS_dummy/data_schema.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..a424210bb6f511b3f841da363d547e383586a67f
--- /dev/null
+++ b/pyKADMOS/KB_CPACS_dummy/data_schema.xsd
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+<!-- definition of simple elements -->
+<xs:element name="wing_AR" type="xs:decimal"/>
+<xs:element name="wing_span" type="xs:decimal"/>
+<xs:element name="wing_MAC" type="xs:decimal"/>
+<xs:element name="fus_l" type="xs:decimal"/>
+<xs:element name="fus_d" type="xs:decimal"/>
+<xs:element name="range" type="xs:decimal"/>
+
+<xs:element name="eng_T" type="xs:decimal"/>
+<xs:element name="cntrl_der" type="xs:decimal"/>
+<xs:element name="flight_data" type="xs:decimal"/>
+<xs:element name="m_MTOW" type="xs:decimal"/>
+<xs:element name="m_wing" type="xs:decimal"/>
+<xs:element name="inertia_MTOW" type="xs:decimal"/>
+<xs:element name="max_load_fac" type="xs:decimal"/>
+<xs:element name="char_OEI" type="xs:decimal"/>
+<xs:element name="em_NOX" type="xs:decimal"/>
+<xs:element name="em_CO2" type="xs:decimal"/>
+<xs:element name="m_fuel" type="xs:decimal"/>
+<xs:element name="C_L" type="xs:decimal"/>
+<xs:element name="C_D" type="xs:decimal"/>
+<xs:element name="C_L_w" type="xs:decimal"/>
+<xs:element name="C_D_w" type="xs:decimal"/>
+<xs:element name="aero_loads" type="xs:decimal"/>
+
+<xs:element name="obj" type="xs:decimal"/>
+<xs:element name="con_FD_OEI" type="xs:decimal"/>
+<xs:element name="con_FD_MLF" type="xs:decimal"/>
+<xs:element name="con_EM_NOX" type="xs:decimal"/>
+<xs:element name="con_EM_CO2" type="xs:decimal"/>
+
+<!-- definition of attributes -->
+<xs:attribute name="tool_name" type="xs:string"/>
+<xs:attribute name="in_or_output" type="xs:string"/>
+
+<!-- definition of complex elements -->
+<xs:element name="aircraft">
+ <xs:complexType>
+ <xs:all>
+ <xs:element ref="wing_AR" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="wing_span" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="wing_MAC" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="fus_l" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="fus_d" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="range" minOccurs="0" maxOccurs="1"/>
+ </xs:all>
+ </xs:complexType>
+</xs:element>
+
+<xs:element name="analyses">
+ <xs:complexType>
+ <xs:all>
+ <xs:element ref="eng_T" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="cntrl_der" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="flight_data" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="m_MTOW" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="m_wing" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="inertia_MTOW" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="max_load_fac" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="char_OEI" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="em_NOX" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="em_CO2" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="m_fuel" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="C_L" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="C_D" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="C_L_w" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="C_D_w" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="aero_loads" minOccurs="0" maxOccurs="1"/>
+ </xs:all>
+ </xs:complexType>
+</xs:element>
+
+<xs:element name="MDO_data">
+ <xs:complexType>
+ <xs:all>
+ <xs:element ref="obj" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="con_FD_OEI" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="con_FD_MLF" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="con_EM_NOX" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="con_EM_CO2" minOccurs="0" maxOccurs="1"/>
+ </xs:all>
+ </xs:complexType>
+</xs:element>
+
+<xs:element name="data_schema">
+ <xs:complexType>
+ <xs:all>
+ <xs:element ref="aircraft" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="analyses" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="MDO_data" minOccurs="0" maxOccurs="1"/>
+ </xs:all>
+ <xs:attribute ref="tool_name" use="required"/>
+ <xs:attribute ref="in_or_output" use="required"/>
+ </xs:complexType>
+</xs:element>
+
+</xs:schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_Sellar/data_schema.xsd b/pyKADMOS/KB_Sellar/data_schema.xsd
index b3c614664663eca13b56abe4fbce43241f5b10fb..0b75dc33e49ae231f8d8f78c4752a9e52be2cfee 100644
--- a/pyKADMOS/KB_Sellar/data_schema.xsd
+++ b/pyKADMOS/KB_Sellar/data_schema.xsd
@@ -18,32 +18,32 @@
<!-- definition of complex elements -->
<xs:element name="geometry">
<xs:complexType>
- <xs:sequence>
+ <xs:all>
<xs:element ref="x1" minOccurs="0" maxOccurs="1"/>
<xs:element ref="z1" minOccurs="0" maxOccurs="1"/>
<xs:element ref="z2" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
+ </xs:all>
</xs:complexType>
</xs:element>
<xs:element name="analyses">
<xs:complexType>
- <xs:sequence>
+ <xs:all>
<xs:element ref="y1" minOccurs="0" maxOccurs="1"/>
<xs:element ref="y2" minOccurs="0" maxOccurs="1"/>
<xs:element ref="g1" minOccurs="0" maxOccurs="1"/>
<xs:element ref="g2" minOccurs="0" maxOccurs="1"/>
<xs:element ref="f" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
+ </xs:all>
</xs:complexType>
</xs:element>
<xs:element name="data_schema">
<xs:complexType>
- <xs:sequence>
+ <xs:all>
<xs:element ref="geometry" minOccurs="0" maxOccurs="1"/>
<xs:element ref="analyses" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
+ </xs:all>
<xs:attribute ref="tool_name" use="required"/>
<xs:attribute ref="in_or_output" use="required"/>
</xs:complexType>
diff --git a/pyKADMOS/KB_big_math_problem/D1-input.xml b/pyKADMOS/KB_big_math_problem/D1-input.xml
index e83a843371cf02874e0bcb1949993d73a630470c..d3c2463c7ce754f0d2760a6d4318b9b7f2a4f12b 100644
--- a/pyKADMOS/KB_big_math_problem/D1-input.xml
+++ b/pyKADMOS/KB_big_math_problem/D1-input.xml
@@ -12,58 +12,58 @@
</z>
<y>
<y2_1>42.0</y2_1>
+ <y2_2>42.0</y2_2>
<y2_3>42.0</y2_3>
- <y2_6>42.0</y2_6>
- <y2_7>42.0</y2_7>
+ <y2_4>42.0</y2_4>
+ <y2_5>42.0</y2_5>
<y2_8>42.0</y2_8>
- <y2_10>42.0</y2_10>
+ <y2_9>42.0</y2_9>
<y3_1>42.0</y3_1>
- <y3_2>42.0</y3_2>
+ <y3_3>42.0</y3_3>
+ <y3_4>42.0</y3_4>
+ <y3_5>42.0</y3_5>
<y3_6>42.0</y3_6>
+ <y3_7>42.0</y3_7>
<y3_8>42.0</y3_8>
<y4_1>42.0</y4_1>
<y4_2>42.0</y4_2>
+ <y4_4>42.0</y4_4>
<y4_5>42.0</y4_5>
+ <y4_6>42.0</y4_6>
<y4_7>42.0</y4_7>
<y4_8>42.0</y4_8>
<y4_9>42.0</y4_9>
- <y5_1>42.0</y5_1>
<y5_2>42.0</y5_2>
- <y5_3>42.0</y5_3>
<y5_4>42.0</y5_4>
- <y5_5>42.0</y5_5>
+ <y5_6>42.0</y5_6>
+ <y5_7>42.0</y5_7>
<y5_8>42.0</y5_8>
+ <y5_10>42.0</y5_10>
<y6_1>42.0</y6_1>
<y6_2>42.0</y6_2>
- <y6_3>42.0</y6_3>
<y6_4>42.0</y6_4>
- <y6_5>42.0</y6_5>
<y6_6>42.0</y6_6>
<y6_7>42.0</y6_7>
+ <y6_8>42.0</y6_8>
+ <y6_9>42.0</y6_9>
<y6_10>42.0</y6_10>
- <y7_1>42.0</y7_1>
- <y7_3>42.0</y7_3>
- <y7_5>42.0</y7_5>
+ <y7_4>42.0</y7_4>
<y7_6>42.0</y7_6>
- <y7_7>42.0</y7_7>
- <y7_9>42.0</y7_9>
- <y8_3>42.0</y8_3>
+ <y7_10>42.0</y7_10>
+ <y8_1>42.0</y8_1>
+ <y8_2>42.0</y8_2>
<y8_4>42.0</y8_4>
- <y8_5>42.0</y8_5>
<y8_6>42.0</y8_6>
<y8_7>42.0</y8_7>
- <y8_8>42.0</y8_8>
- <y8_9>42.0</y8_9>
<y9_1>42.0</y9_1>
- <y9_2>42.0</y9_2>
- <y9_4>42.0</y9_4>
- <y9_6>42.0</y9_6>
+ <y9_3>42.0</y9_3>
<y9_7>42.0</y9_7>
- <y9_10>42.0</y9_10>
+ <y9_9>42.0</y9_9>
<y10_1>42.0</y10_1>
<y10_2>42.0</y10_2>
<y10_3>42.0</y10_3>
- <y10_7>42.0</y10_7>
+ <y10_4>42.0</y10_4>
<y10_8>42.0</y10_8>
+ <y10_9>42.0</y10_9>
</y>
</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_big_math_problem/D10-input.xml b/pyKADMOS/KB_big_math_problem/D10-input.xml
index bf6892f8d858a5503a21cc348b36b33ac66baa58..8a2af42f1a402e73901fab339a1f3b0aa694bf5b 100644
--- a/pyKADMOS/KB_big_math_problem/D10-input.xml
+++ b/pyKADMOS/KB_big_math_problem/D10-input.xml
@@ -11,59 +11,59 @@
<z3>42.0</z3>
</z>
<y>
- <y1_2>42.0</y1_2>
<y1_3>42.0</y1_3>
- <y1_4>42.0</y1_4>
+ <y1_5>42.0</y1_5>
+ <y1_6>42.0</y1_6>
+ <y1_7>42.0</y1_7>
<y1_8>42.0</y1_8>
<y1_9>42.0</y1_9>
- <y1_10>42.0</y1_10>
<y2_1>42.0</y2_1>
<y2_2>42.0</y2_2>
- <y2_3>42.0</y2_3>
- <y2_5>42.0</y2_5>
- <y2_6>42.0</y2_6>
- <y2_7>42.0</y2_7>
+ <y2_4>42.0</y2_4>
<y2_8>42.0</y2_8>
- <y2_9>42.0</y2_9>
<y2_10>42.0</y2_10>
<y3_1>42.0</y3_1>
<y3_2>42.0</y3_2>
- <y3_5>42.0</y3_5>
+ <y3_3>42.0</y3_3>
<y3_6>42.0</y3_6>
- <y3_8>42.0</y3_8>
- <y4_2>42.0</y4_2>
+ <y3_9>42.0</y3_9>
+ <y3_10>42.0</y3_10>
<y4_3>42.0</y4_3>
+ <y4_4>42.0</y4_4>
<y4_5>42.0</y4_5>
<y4_6>42.0</y4_6>
+ <y4_7>42.0</y4_7>
<y4_8>42.0</y4_8>
- <y4_9>42.0</y4_9>
<y4_10>42.0</y4_10>
- <y5_2>42.0</y5_2>
- <y5_5>42.0</y5_5>
- <y5_7>42.0</y5_7>
- <y5_9>42.0</y5_9>
<y5_10>42.0</y5_10>
<y6_1>42.0</y6_1>
<y6_2>42.0</y6_2>
- <y6_3>42.0</y6_3>
+ <y6_4>42.0</y6_4>
+ <y6_5>42.0</y6_5>
<y6_6>42.0</y6_6>
+ <y6_7>42.0</y6_7>
+ <y6_8>42.0</y6_8>
<y6_9>42.0</y6_9>
- <y6_10>42.0</y6_10>
<y7_1>42.0</y7_1>
<y7_2>42.0</y7_2>
- <y7_4>42.0</y7_4>
<y7_5>42.0</y7_5>
- <y7_7>42.0</y7_7>
+ <y7_6>42.0</y7_6>
<y7_8>42.0</y7_8>
+ <y7_9>42.0</y7_9>
<y7_10>42.0</y7_10>
- <y8_1>42.0</y8_1>
- <y9_1>42.0</y9_1>
- <y9_2>42.0</y9_2>
- <y9_3>42.0</y9_3>
+ <y8_2>42.0</y8_2>
+ <y8_3>42.0</y8_3>
+ <y8_4>42.0</y8_4>
+ <y8_6>42.0</y8_6>
+ <y8_8>42.0</y8_8>
+ <y8_9>42.0</y8_9>
+ <y8_10>42.0</y8_10>
<y9_4>42.0</y9_4>
<y9_5>42.0</y9_5>
+ <y9_6>42.0</y9_6>
<y9_7>42.0</y9_7>
<y9_8>42.0</y9_8>
+ <y9_9>42.0</y9_9>
<y9_10>42.0</y9_10>
</y>
</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_big_math_problem/D2-input.xml b/pyKADMOS/KB_big_math_problem/D2-input.xml
index bc2153d0a99a7b3eb58a9e0ea37281ad8d2cf0e0..9ede780928b36e7d14127d84c0d4e14cabaa362c 100644
--- a/pyKADMOS/KB_big_math_problem/D2-input.xml
+++ b/pyKADMOS/KB_big_math_problem/D2-input.xml
@@ -11,59 +11,59 @@
<z3>42.0</z3>
</z>
<y>
- <y1_1>42.0</y1_1>
- <y1_3>42.0</y1_3>
+ <y1_2>42.0</y1_2>
<y1_4>42.0</y1_4>
<y1_5>42.0</y1_5>
<y1_6>42.0</y1_6>
- <y1_7>42.0</y1_7>
- <y1_8>42.0</y1_8>
+ <y1_9>42.0</y1_9>
<y1_10>42.0</y1_10>
- <y3_1>42.0</y3_1>
- <y3_2>42.0</y3_2>
<y3_4>42.0</y3_4>
<y3_5>42.0</y3_5>
<y3_6>42.0</y3_6>
- <y3_7>42.0</y3_7>
- <y3_8>42.0</y3_8>
<y3_9>42.0</y3_9>
<y3_10>42.0</y3_10>
+ <y4_1>42.0</y4_1>
<y4_3>42.0</y4_3>
<y4_4>42.0</y4_4>
+ <y4_6>42.0</y4_6>
+ <y4_7>42.0</y4_7>
<y4_8>42.0</y4_8>
+ <y4_9>42.0</y4_9>
<y5_1>42.0</y5_1>
<y5_2>42.0</y5_2>
+ <y5_3>42.0</y5_3>
<y5_4>42.0</y5_4>
- <y5_5>42.0</y5_5>
- <y5_8>42.0</y5_8>
+ <y5_6>42.0</y5_6>
+ <y5_7>42.0</y5_7>
<y5_9>42.0</y5_9>
<y5_10>42.0</y5_10>
- <y6_1>42.0</y6_1>
<y6_2>42.0</y6_2>
<y6_3>42.0</y6_3>
<y6_4>42.0</y6_4>
<y6_5>42.0</y6_5>
<y6_6>42.0</y6_6>
+ <y6_7>42.0</y6_7>
<y6_8>42.0</y6_8>
<y6_9>42.0</y6_9>
<y6_10>42.0</y6_10>
<y7_2>42.0</y7_2>
- <y7_3>42.0</y7_3>
- <y7_7>42.0</y7_7>
+ <y7_5>42.0</y7_5>
<y7_8>42.0</y7_8>
- <y7_9>42.0</y7_9>
- <y8_5>42.0</y8_5>
+ <y7_10>42.0</y7_10>
+ <y8_4>42.0</y8_4>
<y8_6>42.0</y8_6>
- <y8_9>42.0</y8_9>
- <y9_2>42.0</y9_2>
+ <y8_10>42.0</y8_10>
+ <y9_1>42.0</y9_1>
+ <y9_3>42.0</y9_3>
<y9_4>42.0</y9_4>
<y9_5>42.0</y9_5>
- <y9_7>42.0</y9_7>
- <y9_8>42.0</y9_8>
+ <y9_9>42.0</y9_9>
<y9_10>42.0</y9_10>
+ <y10_1>42.0</y10_1>
+ <y10_2>42.0</y10_2>
<y10_3>42.0</y10_3>
- <y10_4>42.0</y10_4>
- <y10_7>42.0</y10_7>
+ <y10_5>42.0</y10_5>
<y10_8>42.0</y10_8>
+ <y10_10>42.0</y10_10>
</y>
</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_big_math_problem/D3-input.xml b/pyKADMOS/KB_big_math_problem/D3-input.xml
index 1aafdec8e3a2e2e07cb9c192f84bc76904c0aeac..1d70a6c5cbef8adf8076a757d5c0585f9438b01e 100644
--- a/pyKADMOS/KB_big_math_problem/D3-input.xml
+++ b/pyKADMOS/KB_big_math_problem/D3-input.xml
@@ -11,59 +11,59 @@
<z3>42.0</z3>
</z>
<y>
- <y1_4>42.0</y1_4>
- <y1_8>42.0</y1_8>
+ <y1_7>42.0</y1_7>
<y1_9>42.0</y1_9>
<y1_10>42.0</y1_10>
- <y2_2>42.0</y2_2>
+ <y2_1>42.0</y2_1>
<y2_3>42.0</y2_3>
+ <y2_4>42.0</y2_4>
<y2_5>42.0</y2_5>
<y2_6>42.0</y2_6>
<y2_7>42.0</y2_7>
<y2_8>42.0</y2_8>
- <y2_10>42.0</y2_10>
- <y4_1>42.0</y4_1>
- <y4_2>42.0</y4_2>
- <y4_3>42.0</y4_3>
- <y4_8>42.0</y4_8>
+ <y2_9>42.0</y2_9>
+ <y4_5>42.0</y4_5>
+ <y4_6>42.0</y4_6>
+ <y4_7>42.0</y4_7>
<y4_9>42.0</y4_9>
<y4_10>42.0</y4_10>
- <y5_3>42.0</y5_3>
+ <y5_1>42.0</y5_1>
+ <y5_2>42.0</y5_2>
+ <y5_4>42.0</y5_4>
<y5_5>42.0</y5_5>
- <y5_6>42.0</y5_6>
<y5_8>42.0</y5_8>
<y5_9>42.0</y5_9>
- <y5_10>42.0</y5_10>
<y6_1>42.0</y6_1>
<y6_2>42.0</y6_2>
- <y6_5>42.0</y6_5>
- <y6_6>42.0</y6_6>
+ <y6_4>42.0</y6_4>
<y6_8>42.0</y6_8>
- <y6_9>42.0</y6_9>
<y6_10>42.0</y6_10>
- <y7_1>42.0</y7_1>
- <y7_2>42.0</y7_2>
<y7_3>42.0</y7_3>
- <y7_4>42.0</y7_4>
<y7_5>42.0</y7_5>
- <y7_7>42.0</y7_7>
- <y7_10>42.0</y7_10>
+ <y7_6>42.0</y7_6>
+ <y7_8>42.0</y7_8>
+ <y7_9>42.0</y7_9>
<y8_2>42.0</y8_2>
- <y8_3>42.0</y8_3>
<y8_4>42.0</y8_4>
+ <y8_5>42.0</y8_5>
<y8_6>42.0</y8_6>
<y8_7>42.0</y8_7>
- <y8_10>42.0</y8_10>
+ <y8_8>42.0</y8_8>
+ <y8_9>42.0</y8_9>
<y9_2>42.0</y9_2>
- <y9_4>42.0</y9_4>
+ <y9_3>42.0</y9_3>
<y9_5>42.0</y9_5>
<y9_6>42.0</y9_6>
+ <y9_7>42.0</y9_7>
+ <y9_8>42.0</y9_8>
<y9_10>42.0</y9_10>
<y10_1>42.0</y10_1>
- <y10_2>42.0</y10_2>
- <y10_4>42.0</y10_4>
+ <y10_3>42.0</y10_3>
+ <y10_5>42.0</y10_5>
<y10_6>42.0</y10_6>
<y10_7>42.0</y10_7>
+ <y10_8>42.0</y10_8>
+ <y10_9>42.0</y10_9>
<y10_10>42.0</y10_10>
</y>
</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_big_math_problem/D4-input.xml b/pyKADMOS/KB_big_math_problem/D4-input.xml
index 371b0a3ce99f1e71a50e359a9d934a302bb402de..4da578cccafb3db21237940e99e4ab6bcb7b35be 100644
--- a/pyKADMOS/KB_big_math_problem/D4-input.xml
+++ b/pyKADMOS/KB_big_math_problem/D4-input.xml
@@ -12,58 +12,58 @@
</z>
<y>
<y1_1>42.0</y1_1>
+ <y1_2>42.0</y1_2>
+ <y1_3>42.0</y1_3>
<y1_4>42.0</y1_4>
<y1_5>42.0</y1_5>
- <y1_8>42.0</y1_8>
+ <y1_7>42.0</y1_7>
<y1_9>42.0</y1_9>
- <y1_10>42.0</y1_10>
- <y2_1>42.0</y2_1>
+ <y2_2>42.0</y2_2>
<y2_3>42.0</y2_3>
<y2_5>42.0</y2_5>
- <y2_6>42.0</y2_6>
- <y3_3>42.0</y3_3>
- <y3_4>42.0</y3_4>
+ <y2_7>42.0</y2_7>
+ <y2_10>42.0</y2_10>
+ <y3_2>42.0</y3_2>
<y3_5>42.0</y3_5>
- <y3_6>42.0</y3_6>
<y3_7>42.0</y3_7>
+ <y3_8>42.0</y3_8>
<y3_9>42.0</y3_9>
+ <y3_10>42.0</y3_10>
+ <y5_1>42.0</y5_1>
<y5_2>42.0</y5_2>
- <y5_4>42.0</y5_4>
- <y5_6>42.0</y5_6>
- <y5_7>42.0</y5_7>
- <y5_8>42.0</y5_8>
- <y5_9>42.0</y5_9>
+ <y5_5>42.0</y5_5>
<y6_1>42.0</y6_1>
<y6_2>42.0</y6_2>
- <y6_3>42.0</y6_3>
+ <y6_4>42.0</y6_4>
+ <y6_5>42.0</y6_5>
<y6_6>42.0</y6_6>
- <y6_7>42.0</y6_7>
- <y6_8>42.0</y6_8>
- <y6_9>42.0</y6_9>
<y7_1>42.0</y7_1>
<y7_2>42.0</y7_2>
- <y7_4>42.0</y7_4>
<y7_5>42.0</y7_5>
- <y7_6>42.0</y7_6>
+ <y7_7>42.0</y7_7>
<y7_8>42.0</y7_8>
- <y7_9>42.0</y7_9>
<y7_10>42.0</y7_10>
- <y8_1>42.0</y8_1>
<y8_2>42.0</y8_2>
<y8_3>42.0</y8_3>
<y8_4>42.0</y8_4>
<y8_5>42.0</y8_5>
- <y8_6>42.0</y8_6>
+ <y8_7>42.0</y8_7>
<y8_8>42.0</y8_8>
<y8_10>42.0</y8_10>
<y9_1>42.0</y9_1>
+ <y9_2>42.0</y9_2>
<y9_3>42.0</y9_3>
<y9_4>42.0</y9_4>
- <y9_5>42.0</y9_5>
+ <y9_7>42.0</y9_7>
+ <y9_8>42.0</y9_8>
+ <y9_9>42.0</y9_9>
<y9_10>42.0</y9_10>
- <y10_1>42.0</y10_1>
+ <y10_2>42.0</y10_2>
<y10_3>42.0</y10_3>
- <y10_7>42.0</y10_7>
+ <y10_4>42.0</y10_4>
+ <y10_5>42.0</y10_5>
+ <y10_6>42.0</y10_6>
<y10_9>42.0</y10_9>
+ <y10_10>42.0</y10_10>
</y>
</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_big_math_problem/D5-input.xml b/pyKADMOS/KB_big_math_problem/D5-input.xml
index 757024fbb7bf9593e15ebff5943584bc4f6474e6..e736d96773eb69734f93a1ed5666d2c8275fe0be 100644
--- a/pyKADMOS/KB_big_math_problem/D5-input.xml
+++ b/pyKADMOS/KB_big_math_problem/D5-input.xml
@@ -12,57 +12,57 @@
</z>
<y>
<y1_1>42.0</y1_1>
+ <y1_2>42.0</y1_2>
<y1_3>42.0</y1_3>
<y1_4>42.0</y1_4>
+ <y1_5>42.0</y1_5>
<y1_8>42.0</y1_8>
- <y1_9>42.0</y1_9>
- <y2_2>42.0</y2_2>
+ <y2_3>42.0</y2_3>
<y2_4>42.0</y2_4>
<y2_5>42.0</y2_5>
<y2_6>42.0</y2_6>
+ <y2_7>42.0</y2_7>
+ <y2_8>42.0</y2_8>
<y2_9>42.0</y2_9>
- <y3_3>42.0</y3_3>
- <y3_6>42.0</y3_6>
+ <y2_10>42.0</y2_10>
+ <y3_1>42.0</y3_1>
+ <y3_5>42.0</y3_5>
<y3_7>42.0</y3_7>
+ <y3_8>42.0</y3_8>
<y3_9>42.0</y3_9>
+ <y3_10>42.0</y3_10>
<y4_1>42.0</y4_1>
- <y4_3>42.0</y4_3>
+ <y4_2>42.0</y4_2>
<y4_5>42.0</y4_5>
<y4_6>42.0</y4_6>
<y4_9>42.0</y4_9>
<y4_10>42.0</y4_10>
<y6_1>42.0</y6_1>
<y6_2>42.0</y6_2>
+ <y6_3>42.0</y6_3>
<y6_4>42.0</y6_4>
- <y6_5>42.0</y6_5>
- <y6_6>42.0</y6_6>
<y6_7>42.0</y6_7>
<y6_8>42.0</y6_8>
+ <y6_9>42.0</y6_9>
<y6_10>42.0</y6_10>
- <y7_1>42.0</y7_1>
- <y7_2>42.0</y7_2>
- <y7_3>42.0</y7_3>
- <y7_4>42.0</y7_4>
<y7_5>42.0</y7_5>
<y7_6>42.0</y7_6>
<y7_7>42.0</y7_7>
- <y7_8>42.0</y7_8>
+ <y7_9>42.0</y7_9>
+ <y7_10>42.0</y7_10>
<y8_1>42.0</y8_1>
- <y8_8>42.0</y8_8>
- <y8_10>42.0</y8_10>
+ <y8_2>42.0</y8_2>
+ <y8_3>42.0</y8_3>
+ <y8_6>42.0</y8_6>
+ <y8_7>42.0</y8_7>
<y9_1>42.0</y9_1>
- <y9_2>42.0</y9_2>
<y9_3>42.0</y9_3>
<y9_4>42.0</y9_4>
<y9_5>42.0</y9_5>
- <y9_6>42.0</y9_6>
- <y9_7>42.0</y9_7>
<y9_8>42.0</y9_8>
- <y9_10>42.0</y9_10>
+ <y10_1>42.0</y10_1>
<y10_2>42.0</y10_2>
- <y10_4>42.0</y10_4>
- <y10_5>42.0</y10_5>
- <y10_7>42.0</y10_7>
+ <y10_6>42.0</y10_6>
<y10_8>42.0</y10_8>
<y10_9>42.0</y10_9>
</y>
diff --git a/pyKADMOS/KB_big_math_problem/D6-input.xml b/pyKADMOS/KB_big_math_problem/D6-input.xml
index fef15e39f669c3380dd190c55883f67b5377ead1..12316acda7aa50ef787ef5178f82e169938cb6ef 100644
--- a/pyKADMOS/KB_big_math_problem/D6-input.xml
+++ b/pyKADMOS/KB_big_math_problem/D6-input.xml
@@ -13,57 +13,57 @@
<y>
<y1_1>42.0</y1_1>
<y1_3>42.0</y1_3>
- <y1_4>42.0</y1_4>
<y1_6>42.0</y1_6>
<y1_7>42.0</y1_7>
+ <y1_8>42.0</y1_8>
<y1_9>42.0</y1_9>
- <y1_10>42.0</y1_10>
- <y2_2>42.0</y2_2>
+ <y2_1>42.0</y2_1>
<y2_3>42.0</y2_3>
- <y2_6>42.0</y2_6>
- <y2_7>42.0</y2_7>
+ <y2_4>42.0</y2_4>
<y2_8>42.0</y2_8>
- <y2_9>42.0</y2_9>
<y2_10>42.0</y2_10>
+ <y3_1>42.0</y3_1>
<y3_2>42.0</y3_2>
- <y3_3>42.0</y3_3>
<y3_5>42.0</y3_5>
+ <y3_6>42.0</y3_6>
<y3_7>42.0</y3_7>
- <y3_8>42.0</y3_8>
+ <y3_9>42.0</y3_9>
<y3_10>42.0</y3_10>
+ <y4_2>42.0</y4_2>
+ <y4_3>42.0</y4_3>
<y4_4>42.0</y4_4>
<y4_5>42.0</y4_5>
- <y4_7>42.0</y4_7>
<y4_8>42.0</y4_8>
<y4_9>42.0</y4_9>
<y4_10>42.0</y4_10>
- <y5_1>42.0</y5_1>
+ <y5_4>42.0</y5_4>
<y5_5>42.0</y5_5>
<y5_6>42.0</y5_6>
<y5_8>42.0</y5_8>
- <y5_9>42.0</y5_9>
- <y5_10>42.0</y5_10>
- <y7_1>42.0</y7_1>
<y7_2>42.0</y7_2>
<y7_3>42.0</y7_3>
- <y7_5>42.0</y7_5>
- <y7_6>42.0</y7_6>
+ <y7_4>42.0</y7_4>
<y7_7>42.0</y7_7>
+ <y7_9>42.0</y7_9>
<y7_10>42.0</y7_10>
- <y8_1>42.0</y8_1>
+ <y8_2>42.0</y8_2>
<y8_4>42.0</y8_4>
- <y8_5>42.0</y8_5>
- <y8_7>42.0</y8_7>
+ <y8_6>42.0</y8_6>
+ <y8_8>42.0</y8_8>
<y8_10>42.0</y8_10>
+ <y9_1>42.0</y9_1>
<y9_2>42.0</y9_2>
- <y9_3>42.0</y9_3>
+ <y9_4>42.0</y9_4>
<y9_5>42.0</y9_5>
+ <y9_6>42.0</y9_6>
<y9_7>42.0</y9_7>
- <y9_9>42.0</y9_9>
+ <y9_8>42.0</y9_8>
<y10_1>42.0</y10_1>
<y10_4>42.0</y10_4>
+ <y10_5>42.0</y10_5>
<y10_6>42.0</y10_6>
- <y10_8>42.0</y10_8>
+ <y10_7>42.0</y10_7>
<y10_9>42.0</y10_9>
+ <y10_10>42.0</y10_10>
</y>
</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_big_math_problem/D7-input.xml b/pyKADMOS/KB_big_math_problem/D7-input.xml
index 6b7b0acc5a4971b2150f394655b64277196c42aa..1ba50a556628e02d04660cec78de1b646dd65073 100644
--- a/pyKADMOS/KB_big_math_problem/D7-input.xml
+++ b/pyKADMOS/KB_big_math_problem/D7-input.xml
@@ -11,58 +11,58 @@
<z3>42.0</z3>
</z>
<y>
- <y1_3>42.0</y1_3>
+ <y1_2>42.0</y1_2>
<y1_4>42.0</y1_4>
<y1_5>42.0</y1_5>
<y1_6>42.0</y1_6>
- <y1_7>42.0</y1_7>
<y1_8>42.0</y1_8>
- <y1_9>42.0</y1_9>
- <y1_10>42.0</y1_10>
<y2_1>42.0</y2_1>
<y2_2>42.0</y2_2>
<y2_3>42.0</y2_3>
- <y2_5>42.0</y2_5>
+ <y2_4>42.0</y2_4>
<y2_7>42.0</y2_7>
<y2_8>42.0</y2_8>
<y2_9>42.0</y2_9>
- <y3_1>42.0</y3_1>
<y3_3>42.0</y3_3>
<y3_4>42.0</y3_4>
<y3_6>42.0</y3_6>
<y3_8>42.0</y3_8>
<y3_9>42.0</y3_9>
+ <y3_10>42.0</y3_10>
<y4_1>42.0</y4_1>
<y4_2>42.0</y4_2>
<y4_3>42.0</y4_3>
<y4_4>42.0</y4_4>
- <y4_6>42.0</y4_6>
- <y4_7>42.0</y4_7>
- <y4_10>42.0</y4_10>
- <y5_2>42.0</y5_2>
+ <y4_8>42.0</y4_8>
+ <y5_1>42.0</y5_1>
+ <y5_4>42.0</y5_4>
<y5_5>42.0</y5_5>
<y5_7>42.0</y5_7>
<y5_8>42.0</y5_8>
+ <y5_9>42.0</y5_9>
<y5_10>42.0</y5_10>
<y6_1>42.0</y6_1>
- <y6_2>42.0</y6_2>
- <y6_4>42.0</y6_4>
+ <y6_3>42.0</y6_3>
<y6_5>42.0</y6_5>
- <y6_6>42.0</y6_6>
<y6_7>42.0</y6_7>
+ <y6_8>42.0</y6_8>
<y6_10>42.0</y6_10>
- <y8_1>42.0</y8_1>
<y8_2>42.0</y8_2>
- <y8_3>42.0</y8_3>
+ <y8_4>42.0</y8_4>
<y8_5>42.0</y8_5>
<y8_6>42.0</y8_6>
<y8_7>42.0</y8_7>
<y8_8>42.0</y8_8>
- <y8_10>42.0</y8_10>
+ <y8_9>42.0</y8_9>
+ <y9_1>42.0</y9_1>
+ <y9_4>42.0</y9_4>
+ <y9_5>42.0</y9_5>
+ <y9_6>42.0</y9_6>
<y9_9>42.0</y9_9>
- <y9_10>42.0</y9_10>
<y10_1>42.0</y10_1>
+ <y10_4>42.0</y10_4>
<y10_5>42.0</y10_5>
+ <y10_6>42.0</y10_6>
<y10_7>42.0</y10_7>
<y10_10>42.0</y10_10>
</y>
diff --git a/pyKADMOS/KB_big_math_problem/D8-input.xml b/pyKADMOS/KB_big_math_problem/D8-input.xml
index 1fa967b6d84e0ccf2b7809178af92ead98a5d3ca..9a594c33e42530a54e0e8e89f6fff7c1c19d5992 100644
--- a/pyKADMOS/KB_big_math_problem/D8-input.xml
+++ b/pyKADMOS/KB_big_math_problem/D8-input.xml
@@ -12,58 +12,58 @@
</z>
<y>
<y1_1>42.0</y1_1>
- <y1_2>42.0</y1_2>
<y1_3>42.0</y1_3>
+ <y1_4>42.0</y1_4>
<y1_5>42.0</y1_5>
+ <y1_6>42.0</y1_6>
<y1_8>42.0</y1_8>
<y1_9>42.0</y1_9>
<y2_1>42.0</y2_1>
<y2_2>42.0</y2_2>
<y2_3>42.0</y2_3>
- <y2_6>42.0</y2_6>
+ <y2_4>42.0</y2_4>
+ <y2_5>42.0</y2_5>
<y2_7>42.0</y2_7>
<y2_8>42.0</y2_8>
<y2_9>42.0</y2_9>
+ <y3_1>42.0</y3_1>
<y3_2>42.0</y3_2>
<y3_3>42.0</y3_3>
<y3_4>42.0</y3_4>
<y3_5>42.0</y3_5>
- <y3_6>42.0</y3_6>
<y3_7>42.0</y3_7>
+ <y3_8>42.0</y3_8>
<y3_9>42.0</y3_9>
<y3_10>42.0</y3_10>
- <y4_2>42.0</y4_2>
<y4_4>42.0</y4_4>
- <y4_5>42.0</y4_5>
<y4_6>42.0</y4_6>
- <y4_7>42.0</y4_7>
- <y4_8>42.0</y4_8>
- <y4_10>42.0</y4_10>
+ <y5_1>42.0</y5_1>
+ <y5_2>42.0</y5_2>
<y5_3>42.0</y5_3>
<y5_4>42.0</y5_4>
+ <y5_5>42.0</y5_5>
+ <y5_6>42.0</y5_6>
+ <y5_7>42.0</y5_7>
<y5_9>42.0</y5_9>
+ <y5_10>42.0</y5_10>
+ <y6_1>42.0</y6_1>
+ <y6_2>42.0</y6_2>
+ <y6_3>42.0</y6_3>
<y6_4>42.0</y6_4>
- <y6_5>42.0</y6_5>
+ <y6_6>42.0</y6_6>
<y6_8>42.0</y6_8>
<y6_9>42.0</y6_9>
<y6_10>42.0</y6_10>
- <y7_1>42.0</y7_1>
- <y7_2>42.0</y7_2>
- <y7_3>42.0</y7_3>
- <y7_8>42.0</y7_8>
+ <y7_4>42.0</y7_4>
+ <y7_6>42.0</y7_6>
+ <y7_7>42.0</y7_7>
+ <y7_9>42.0</y7_9>
<y7_10>42.0</y7_10>
- <y9_1>42.0</y9_1>
- <y9_2>42.0</y9_2>
- <y9_3>42.0</y9_3>
<y9_5>42.0</y9_5>
- <y9_6>42.0</y9_6>
+ <y9_8>42.0</y9_8>
<y9_10>42.0</y9_10>
<y10_2>42.0</y10_2>
<y10_5>42.0</y10_5>
- <y10_6>42.0</y10_6>
- <y10_7>42.0</y10_7>
- <y10_8>42.0</y10_8>
- <y10_9>42.0</y10_9>
<y10_10>42.0</y10_10>
</y>
</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/KB_big_math_problem/D9-input.xml b/pyKADMOS/KB_big_math_problem/D9-input.xml
index c2ac3cd496d1682eeab9af8d63a13b15b73f1000..3d742d88f409ac2dac706eb94e039ade63e4ad69 100644
--- a/pyKADMOS/KB_big_math_problem/D9-input.xml
+++ b/pyKADMOS/KB_big_math_problem/D9-input.xml
@@ -12,58 +12,58 @@
</z>
<y>
<y1_1>42.0</y1_1>
- <y1_4>42.0</y1_4>
- <y1_5>42.0</y1_5>
- <y1_6>42.0</y1_6>
+ <y1_3>42.0</y1_3>
+ <y1_7>42.0</y1_7>
+ <y1_8>42.0</y1_8>
+ <y1_9>42.0</y1_9>
<y1_10>42.0</y1_10>
<y2_2>42.0</y2_2>
<y2_3>42.0</y2_3>
- <y2_4>42.0</y2_4>
- <y2_5>42.0</y2_5>
- <y2_6>42.0</y2_6>
+ <y2_7>42.0</y2_7>
<y2_9>42.0</y2_9>
<y2_10>42.0</y2_10>
- <y3_1>42.0</y3_1>
<y3_2>42.0</y3_2>
<y3_4>42.0</y3_4>
<y3_5>42.0</y3_5>
<y3_6>42.0</y3_6>
- <y3_7>42.0</y3_7>
- <y3_8>42.0</y3_8>
<y3_10>42.0</y3_10>
+ <y4_1>42.0</y4_1>
<y4_2>42.0</y4_2>
<y4_4>42.0</y4_4>
- <y4_7>42.0</y4_7>
+ <y4_5>42.0</y4_5>
+ <y4_6>42.0</y4_6>
<y4_8>42.0</y4_8>
- <y4_9>42.0</y4_9>
<y4_10>42.0</y4_10>
<y5_1>42.0</y5_1>
- <y5_2>42.0</y5_2>
<y5_3>42.0</y5_3>
- <y5_5>42.0</y5_5>
+ <y5_4>42.0</y5_4>
<y5_6>42.0</y5_6>
<y5_7>42.0</y5_7>
<y5_8>42.0</y5_8>
<y5_9>42.0</y5_9>
+ <y5_10>42.0</y5_10>
<y6_1>42.0</y6_1>
- <y6_5>42.0</y6_5>
+ <y6_3>42.0</y6_3>
+ <y6_4>42.0</y6_4>
+ <y6_6>42.0</y6_6>
+ <y6_7>42.0</y6_7>
<y6_8>42.0</y6_8>
<y7_1>42.0</y7_1>
<y7_2>42.0</y7_2>
+ <y7_3>42.0</y7_3>
<y7_4>42.0</y7_4>
<y7_7>42.0</y7_7>
<y7_10>42.0</y7_10>
<y8_2>42.0</y8_2>
+ <y8_3>42.0</y8_3>
<y8_4>42.0</y8_4>
- <y8_6>42.0</y8_6>
<y8_7>42.0</y8_7>
- <y8_8>42.0</y8_8>
<y8_9>42.0</y8_9>
<y8_10>42.0</y8_10>
<y10_1>42.0</y10_1>
<y10_2>42.0</y10_2>
- <y10_3>42.0</y10_3>
- <y10_4>42.0</y10_4>
- <y10_5>42.0</y10_5>
+ <y10_6>42.0</y10_6>
+ <y10_8>42.0</y10_8>
+ <y10_10>42.0</y10_10>
</y>
</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/MDOproblem.py b/pyKADMOS/MDOproblem.py
index 48a14429c6dbd688e53324b798a6a001d89a49bd..eca92f84d846d050e0c75e62c7c36280ca3b6f0e 100644
--- a/pyKADMOS/MDOproblem.py
+++ b/pyKADMOS/MDOproblem.py
@@ -7,7 +7,6 @@ import numpy as np
from lxml import etree
import networkx as nx
import matplotlib.pyplot as plt
-from matplotlib import patches
class MDOproblem:
@@ -72,6 +71,7 @@ class MDOproblem:
print ''
# Additional checks
# TODO: Add checks on input given (naming conventions, required data, etcetera).
+ # TODO: Add check on unique tool names in input and output XMLs
def check_against_xsd(self):
# Parse the XML Schema
@@ -573,13 +573,16 @@ class MDOproblem:
"#6C8F7D", "#D7BFC2", "#3C3E6E", "#D83D66", "#2F5D9B", "#6C5E46", "#D25B88", "#5B656C", "#00B57F",
"#545C46", "#866097", "#365D25", "#252F99", "#00CCFF", "#674E60", "#FC009C", "#92896B"]
- def get_partitioned_graph(self, G, n_parts, output='DiGraph'):
+ def get_partitioned_graph(self, G, n_parts, tpwgts=None, recursive=False, contig=False, output='DiGraph'):
"""
Partition a graph using the Metis algorithm (http://glaros.dtc.umn.edu/gkhome/metis/metis/overview). Note that
partitioning can only be performed on undirected graphs. Therefore every graph input is translated into an
undirected graph.
:param G: graph object
:param n_parts: number of partitions requested (algorithm might provide less)
+ :param tpwgts: list of target partition weights
+ :param recursive: Metis option
+ :param contig: Metis option
:param output: set whether expected output is a DiGraph or normal Graph
:return edgecuts: list of edges that have been cut
:return parts: list of partition group to which each node belongs
@@ -589,7 +592,7 @@ class MDOproblem:
if n_parts > len(color_list):
raise IOError('Maximum number of partitions is {}. {} partitions have been specified.'\
.format(len(color_list),n_parts))
- (edgecuts, parts) = metis.part_graph(G_und, n_parts)
+ (edgecuts, parts) = metis.part_graph(G_und, n_parts, tpwgts=tpwgts, recursive=recursive, contig=contig)
# Store partition colors
colors = color_list[0:n_parts]
@@ -812,9 +815,11 @@ class MDOproblem:
if save_as:
plt.savefig(save_as + '.png')
- def draw_adjacency_matrix(self, G):
+ def draw_adjacency_matrix(self, G, fig_num=1, fig_size=(7,7)):
"""
:param G: networkx graph
+ :param fig_num: figure number
+ :param fig_size: figure size
:return:
"""
# Get adjacency matrix in right format
@@ -825,7 +830,7 @@ class MDOproblem:
adjacency_matrix[i,i] = 0.5
# Plot adjacency matrix in toned-down black and white
- plt.figure(figsize=(7, 7)) # in inches
+ plt.figure(num=fig_num,figsize=fig_size) # in inches
plt.imshow(adjacency_matrix,
cmap="Greys",
interpolation="nearest")
diff --git a/pyKADMOS/MDOproblem.pyc b/pyKADMOS/MDOproblem.pyc
index a645224eaa55fa2fae64e891aee39173d645f839..9272972458d631071bda52379d90ea2bedb8ca04 100644
Binary files a/pyKADMOS/MDOproblem.pyc and b/pyKADMOS/MDOproblem.pyc differ
diff --git a/pyKADMOS/mathProblem.py b/pyKADMOS/mathProblem.py
index 9fe54b98e33b5e41faf7ebcb04cc2256e36d810e..bbd11f4f22f5c9da4588d53387a0cf336364cdca 100644
--- a/pyKADMOS/mathProblem.py
+++ b/pyKADMOS/mathProblem.py
@@ -36,5 +36,7 @@ mathProblem.plot_graph(MCG, 3, color_setting='types', fig_size=fig_size)
mathProblem.plot_graph(MCG_contracted_graph, 4, fig_size=fig_size)
mathProblem.draw_adjacency_matrix(MCG)
+for node, data in MCG.nodes_iter(data=True):
+ print node
plt.show()
diff --git a/pyKADMOS/sellarProblem.py b/pyKADMOS/sellarProblem.py
index e786458c5daf939660df0d92fef988b16bbb6d01..a0c60afcfb2d7c0072224d60055b6b2ffef68708 100644
--- a/pyKADMOS/sellarProblem.py
+++ b/pyKADMOS/sellarProblem.py
@@ -64,8 +64,17 @@ sellarProblem.draw_adjacency_matrix(MCG)
# test = nx.simple_cycles(MCG)
# print list(test)
+i=1
+for node, data in MCG.nodes_iter(data=True):
+ MCG.node[node]['weight'] = i*i*10
+ #i+=1
+MCG.graph['node_weight_attr'] = 'weight'
-MCG_part = sellarProblem.get_partitioned_graph(MCG,4,output='Graph')
+for node, data in MCG.nodes_iter(data=True):
+ print node
+ print data
+
+MCG_part = sellarProblem.get_partitioned_graph(MCG,3,output='Graph',recursive=False, contig=True)#,tpwgts=[0.5,0.2,0.3])
sellarProblem.plot_graph(MCG_part, 9, color_setting='partitions', fig_size=fig_size)
plt.show()
diff --git a/pyKADMOS/test_pymetis b/pyKADMOS/test_pymetis
index 6b5aa06de6ea6f2d4ff5903e2fc8de0cccc19beb..02de47af0f2b27509b1335651dec71ddc13ac8a8 100644
--- a/pyKADMOS/test_pymetis
+++ b/pyKADMOS/test_pymetis
@@ -3,14 +3,24 @@ import metis
G = metis.example_networkx()
G = nx.cycle_graph(50)
-(edgecuts, parts) = metis.part_graph(G, 3)
+i=1
+for node, data in G.nodes_iter(data=True):
+ G.node[node]['weight'] = i*i*10
+ #i+=1
+G.graph['node_weight_attr'] = 'weight'
+
+for node, data in G.nodes_iter(data=True):
+ print node
+ print data
+
+
+(edgecuts, parts) = metis.part_graph(G, 3, tpwgts=[0.1,0.4,0.5])
colors = ['red','blue','green']
node_colors = []
for i, p in enumerate(parts):
G.node[i]['color'] = colors[p]
node_colors.append(colors[p])
-
import matplotlib.pyplot as plt
nx.draw(G,node_color=node_colors)
plt.show()
\ No newline at end of file