diff --git a/.gitignore b/.gitignore index 91d5bcc0bac55111a7fe730869f8dec0d9c5f3cc..8b1302f44aff1243fe7ad44d864c777f9ff8d3bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ TODO -*.pyc \ No newline at end of file +*.pyc +.idea/** +.ipynb_checkpoints/** \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 2aa90efdb4ceee2d9761e71cda14884459ece84e..0000000000000000000000000000000000000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="InspectionProjectProfileManager"> - <profile version="1.0"> - <option name="myName" value="Project Default" /> - <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true"> - <option name="ignoredErrors"> - <list> - <option value="N806" /> - <option value="N802" /> - </list> - </option> - </inspection_tool> - </profile> -</component> \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b312839bf2e939fea3ebdef15630a4b33e57caf..0000000000000000000000000000000000000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ -<component name="InspectionProjectProfileManager"> - <settings> - <option name="PROJECT_PROFILE" value="Project Default" /> - <option name="USE_PROJECT_PROFILE" value="true" /> - <version value="1.0" /> - </settings> -</component> \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index e5496ac2120c1f431483721827232e65851009ba..29cbf5e876477d42b909f45c301e1d9a6444d443 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -48,5 +48,5 @@ <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" default="false" assert-keyword="false" jdk-15="false" project-jdk-name="Python 2.7.12 (~/anaconda2/bin/python2.7)" project-jdk-type="Python SDK" /> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" default="false" assert-keyword="false" jdk-15="false" project-jdk-name="Python 2.7.11 (~/anaconda2/bin/python2.7)" project-jdk-type="Python SDK" /> </project> \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d16994e6295bed31b7d291c66f6d2056e00d479e..dd1fe2a560ef66eef494fa2e30f2f9111ce47749 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,24 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="BookmarkManager"> - <bookmark url="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/LateFusion.py" line="45" /> + <bookmark url="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/LateFusion.py" line="118" /> </component> <component name="ChangeListManager"> <list default="true" id="7b111a3e-1726-4d52-a9de-f7a3f867dbc7" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Code/ExecClassif.py" /> - <change type="MOVED" beforePath="$PROJECT_DIR$/Code/MultiView/GetMutliviewDb.py" afterPath="$PROJECT_DIR$/Code/MultiView/GetMultiviewDb.py" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/Code/.gitignore" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/Code/Baptiste/mumbo.py" afterPath="" /> + <change type="MOVED" beforePath="$PROJECT_DIR$/Code/Niko/HelperFunctions/Versions.py" afterPath="$PROJECT_DIR$/Code/Versions.py" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/MonoView/ClassifMonoView.py" afterPath="$PROJECT_DIR$/Code/MonoView/ClassifMonoView.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/MonoView/ExecClassifMonoView.py" afterPath="$PROJECT_DIR$/Code/MonoView/ExecClassifMonoView.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/MonoView/__init__.py" afterPath="$PROJECT_DIR$/Code/MonoView/__init__.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/MultiView/ExecMultiview.py" afterPath="$PROJECT_DIR$/Code/MultiView/ExecMultiview.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/MultiView/Fusion/Fusion.py" afterPath="$PROJECT_DIR$/Code/MultiView/Fusion/Fusion.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/MultiView/Fusion/Methods/EarlyFusion.py" afterPath="$PROJECT_DIR$/Code/MultiView/Fusion/Methods/EarlyFusion.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/MultiView/Fusion/Methods/LateFusion.py" afterPath="$PROJECT_DIR$/Code/MultiView/Fusion/Methods/LateFusion.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/MultiView/Mumbo/Mumbo.py" afterPath="$PROJECT_DIR$/Code/MultiView/Mumbo/Mumbo.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/MultiView/Mumbo/analyzeResults.py" afterPath="$PROJECT_DIR$/Code/MultiView/Mumbo/analyzeResults.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/MultiView/__init__.py" afterPath="$PROJECT_DIR$/Code/MultiView/__init__.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/MultiView/run.py" afterPath="$PROJECT_DIR$/Code/MultiView/run.py" /> </list> <ignored path="multiview-machine-learning-omis.iws" /> <ignored path=".idea/workspace.xml" /> @@ -30,6 +24,7 @@ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="LAST_RESOLUTION" value="IGNORE" /> </component> + <component name="ChangesViewManager" flattened_view="true" show_ignored="false" /> <component name="CoverageDataManager"> <SUITE FILE_PATH="coverage/multiview-machine-learning-omis$run.coverage" NAME="run Coverage Results" MODIFIED="1471356712601" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Code/MultiView" /> </component> @@ -42,23 +37,11 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="ExecMultiview.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Code/MultiView/ExecMultiview.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="162"> - <caret line="9" column="15" selection-start-line="9" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> - <folding> - <element signature="e#0#10#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> <file leaf-file-name="ExecClassifMonoView.py" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/Code/MonoView/ExecClassifMonoView.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="702"> - <caret line="72" column="59" selection-start-line="72" selection-start-column="59" selection-end-line="72" selection-end-column="59" /> + <state vertical-scroll-proportion="0.0"> + <caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" /> <folding> <element signature="e#113#181#0" expanded="true" /> </folding> @@ -66,11 +49,11 @@ </provider> </entry> </file> - <file leaf-file-name="ExecClassif.py" pinned="false" current-in-tab="true"> + <file leaf-file-name="ExecClassif.py" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/Code/ExecClassif.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="576"> - <caret line="80" column="14" selection-start-line="80" selection-start-column="14" selection-end-line="80" selection-end-column="14" /> + <state vertical-scroll-proportion="0.0"> + <caret line="58" column="0" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" /> <folding> <element signature="e#0#15#0" expanded="true" /> </folding> @@ -78,75 +61,73 @@ </provider> </entry> </file> - <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Code/MonoView/__init__.py"> + <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/.gitignore"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="50" selection-start-line="0" selection-start-column="50" selection-end-line="0" selection-end-column="50" /> + <state vertical-scroll-proportion="0.05856833"> + <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/__init__.py"> + <file leaf-file-name="Versions.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/Versions.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 vertical-scroll-proportion="0.0"> + <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="LateFusion.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/LateFusion.py"> + <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/MonoView/__init__.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-162"> - <caret line="26" column="33" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" /> + <state vertical-scroll-proportion="0.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> </file> - <file leaf-file-name="Fusion.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Fusion.py"> + <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/__init__.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="36"> - <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> + <state vertical-scroll-proportion="0.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> </file> - <file leaf-file-name="EarlyFusion.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/EarlyFusion.py"> + <file leaf-file-name="LateFusion.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/LateFusion.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="468"> - <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0"> + <caret line="69" column="17" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" /> <folding> - <element signature="e#45#71#0" expanded="true" /> + <marker date="1471642808835" expanded="false" signature="45:152" placeholder="import ..." /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="Mumbo.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/Mumbo.py"> + <file leaf-file-name="Fusion.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Fusion.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="342"> - <caret line="253" column="24" selection-start-line="253" selection-start-column="24" selection-end-line="253" selection-end-column="24" /> - <folding> - <element signature="e#0#18#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="0.0"> + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" /> + <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/__init__.py"> + <file leaf-file-name="EarlyFusion.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/EarlyFusion.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 vertical-scroll-proportion="0.0"> + <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" /> <folding /> </state> </provider> @@ -193,14 +174,14 @@ <option value="$PROJECT_DIR$/Code/MultiView/Fusion/Methods/LateFusion.py" /> <option value="$PROJECT_DIR$/Code/MonoView/__init__.py" /> <option value="$PROJECT_DIR$/Code/ExecClassif.py" /> + <option value="$PROJECT_DIR$/.gitignore" /> </list> </option> </component> - <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" /> - <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" /> + <component name="JsBuildToolGruntFileManager" detection-done="true" /> + <component name="JsBuildToolPackageJson" detection-done="true" /> <component name="JsGulpfileManager"> <detection-done>true</detection-done> - <sorting>DEFINITION_ORDER</sorting> </component> <component name="ProjectFrameBounds"> <option name="x" value="65" /> @@ -233,6 +214,8 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="Scope" /> + <pane id="Scratches" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -265,142 +248,8 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="multiview-machine-learning-omis" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="multiview-machine-learning-omis" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Code" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="MultiView" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="multiview-machine-learning-omis" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="multiview-machine-learning-omis" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Code" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="MultiView" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Mumbo" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="multiview-machine-learning-omis" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="multiview-machine-learning-omis" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Code" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="MultiView" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Mumbo" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Classifiers" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="multiview-machine-learning-omis" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="multiview-machine-learning-omis" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Code" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="MultiView" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Fusion" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="multiview-machine-learning-omis" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="multiview-machine-learning-omis" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Code" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="MultiView" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Fusion" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Methods" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="multiview-machine-learning-omis" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="multiview-machine-learning-omis" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Code" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="MonoView" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </pane> - <pane id="Scratches" /> - <pane id="Scope" /> <pane id="PackagesPane" /> </panes> </component> @@ -414,6 +263,7 @@ </component> <component name="RecentsManager"> <key name="MoveFile.RECENT_KEYS"> + <recent name="$PROJECT_DIR$/Code" /> <recent name="$PROJECT_DIR$/Code/MonoView" /> </key> </component> @@ -426,26 +276,31 @@ </configuration> <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> <module name="" /> + <option name="ACTIVITY_CLASS" value="" /> + <option name="MODE" value="default_activity" /> <option name="DEPLOY" value="true" /> <option name="ARTIFACT_NAME" value="" /> - <option name="PM_INSTALL_OPTIONS" value="" /> - <option name="ACTIVITY_EXTRA_FLAGS" value="" /> - <option name="MODE" value="default_activity" /> <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" /> + <option name="USE_LAST_SELECTED_DEVICE" value="false" /> <option name="PREFERRED_AVD" value="" /> + <option name="USE_COMMAND_LINE" value="true" /> + <option name="COMMAND_LINE" value="" /> + <option name="WIPE_USER_DATA" value="false" /> + <option name="DISABLE_BOOT_ANIMATION" value="false" /> + <option name="NETWORK_SPEED" value="full" /> + <option name="NETWORK_LATENCY" value="none" /> <option name="CLEAR_LOGCAT" value="false" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> - <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> - <option name="FORCE_STOP_RUNNING_APP" value="true" /> - <option name="DEBUGGER_TYPE" value="Java" /> - <option name="USE_LAST_SELECTED_DEVICE" value="false" /> - <option name="PREFERRED_AVD" value="" /> - <Java /> - <Profilers> - <option name="GAPID_DISABLE_PCS" value="false" /> - </Profilers> - <option name="DEEP_LINK" value="" /> - <option name="ACTIVITY_CLASS" value="" /> + <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> + <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" /> + <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> + <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" /> + <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" /> + <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" /> + <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" /> + <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" /> + <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" /> + <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" /> <method /> </configuration> <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> @@ -455,20 +310,27 @@ <option name="METHOD_NAME" value="" /> <option name="CLASS_NAME" value="" /> <option name="PACKAGE_NAME" value="" /> - <option name="EXTRA_OPTIONS" value="" /> <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" /> + <option name="USE_LAST_SELECTED_DEVICE" value="false" /> <option name="PREFERRED_AVD" value="" /> + <option name="USE_COMMAND_LINE" value="true" /> + <option name="COMMAND_LINE" value="" /> + <option name="WIPE_USER_DATA" value="false" /> + <option name="DISABLE_BOOT_ANIMATION" value="false" /> + <option name="NETWORK_SPEED" value="full" /> + <option name="NETWORK_LATENCY" value="none" /> <option name="CLEAR_LOGCAT" value="false" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> - <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> - <option name="FORCE_STOP_RUNNING_APP" value="true" /> - <option name="DEBUGGER_TYPE" value="Java" /> - <option name="USE_LAST_SELECTED_DEVICE" value="false" /> - <option name="PREFERRED_AVD" value="" /> - <Java /> - <Profilers> - <option name="GAPID_DISABLE_PCS" value="false" /> - </Profilers> + <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> + <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" /> + <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> + <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" /> + <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" /> + <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" /> + <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" /> + <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" /> + <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" /> + <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" /> <method /> </configuration> <configuration default="true" type="Applet" factoryName="Applet"> @@ -494,66 +356,7 @@ <envs /> <method /> </configuration> - <configuration default="true" type="ArquillianJUnit" factoryName=""> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> - <option name="arquillianRunConfiguration"> - <value> - <option name="containerStateName" value="" /> - </value> - </option> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <envs /> - <patterns /> - <method /> - </configuration> - <configuration default="true" type="ArquillianTestNG" factoryName=""> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> - <option name="arquillianRunConfiguration"> - <value> - <option name="containerStateName" value="" /> - </value> - </option> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="SUITE_NAME" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="GROUP_NAME" /> - <option name="TEST_OBJECT" value="CLASS" /> - <option name="VM_PARAMETERS" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" /> - <option name="OUTPUT_DIRECTORY" /> - <option name="ANNOTATION_TYPE" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <option name="USE_DEFAULT_REPORTERS" value="false" /> - <option name="PROPERTIES_FILE" /> - <envs /> - <properties /> - <listeners /> - <method /> - </configuration> - <configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path=""> + <configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" web_path=""> <method /> </configuration> <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java"> @@ -661,12 +464,13 @@ <method /> </configuration> <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails"> + <module name="" /> <setting name="vmparams" value="" /> <setting name="cmdLine" value="run-app" /> - <setting name="passParentEnv" value="true" /> - <setting name="launchBrowser" value="true" /> <setting name="depsClasspath" value="false" /> + <setting name="passParentEnv" value="true" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <setting name="launchBrowser" value="true" /> <method /> </configuration> <configuration default="true" type="JUnit" factoryName="JUnit"> @@ -760,6 +564,9 @@ <envs /> <method /> </configuration> + <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" working-dir=""> + <method /> + </configuration> <configuration default="true" type="PyBehaveRunConfigurationType" factoryName="Behave"> <option name="INTERPRETER_OPTIONS" value="" /> <option name="PARENT_ENVS" value="true" /> @@ -814,6 +621,36 @@ <option name="PORT" value="5005" /> <method /> </configuration> + <configuration default="true" type="ScalaTestRunConfiguration" factoryName="ScalaTest"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <module name="" /> + <setting name="path" value="" /> + <setting name="package" value="" /> + <setting name="vmparams" value="" /> + <setting name="params" value="" /> + <setting name="workingDirectory" value="" /> + <setting name="searchForTest" value="Across module dependencies" /> + <setting name="testName" value="" /> + <setting name="testKind" value="Class" /> + <setting name="showProgressMessages" value="true" /> + <envs /> + <method /> + </configuration> + <configuration default="true" type="Specs2RunConfiguration" factoryName="Specs2"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <module name="" /> + <setting name="path" value="" /> + <setting name="package" value="" /> + <setting name="vmparams" value="" /> + <setting name="params" value="" /> + <setting name="workingDirectory" value="" /> + <setting name="searchForTest" value="Across module dependencies" /> + <setting name="testName" value="" /> + <setting name="testKind" value="Class" /> + <setting name="showProgressMessages" value="true" /> + <envs /> + <method /> + </configuration> <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <module name="" /> @@ -876,21 +713,7 @@ <listeners /> <method /> </configuration> - <configuration default="true" type="Tox" factoryName="Tox"> - <option name="INTERPRETER_OPTIONS" value="" /> - <option name="PARENT_ENVS" value="true" /> - <envs /> - <option name="SDK_HOME" value="" /> - <option name="WORKING_DIRECTORY" value="" /> - <option name="IS_MODULE_SDK" value="false" /> - <option name="ADD_CONTENT_ROOTS" value="true" /> - <option name="ADD_SOURCE_ROOTS" value="true" /> - <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" /> - <module name="multiview-machine-learning-omis" /> - <method /> - </configuration> <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js"> - <node-interpreter>project</node-interpreter> <node-options /> <gulpfile /> <tasks /> @@ -901,10 +724,21 @@ <configuration default="true" type="js.build_tools.npm" factoryName="npm"> <command value="run-script" /> <scripts /> - <node-interpreter value="project" /> <envs /> <method /> </configuration> + <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha"> + <node-options /> + <working-directory>$PROJECT_DIR$</working-directory> + <pass-parent-env>true</pass-parent-env> + <envs /> + <ui>bdd</ui> + <extra-mocha-options /> + <test-kind>DIRECTORY</test-kind> + <test-directory /> + <recursive>false</recursive> + <method /> + </configuration> <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher"> <method /> </configuration> @@ -1021,6 +855,21 @@ <option name="USE_KEYWORD" value="false" /> <method /> </configuration> + <configuration default="true" type="uTestRunConfiguration" factoryName="utest"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <module name="" /> + <setting name="path" value="" /> + <setting name="package" value="" /> + <setting name="vmparams" value="" /> + <setting name="params" value="" /> + <setting name="workingDirectory" value="" /> + <setting name="searchForTest" value="Across module dependencies" /> + <setting name="testName" value="" /> + <setting name="testKind" value="Class" /> + <setting name="showProgressMessages" value="true" /> + <envs /> + <method /> + </configuration> <configuration default="false" name="run" type="PythonConfigurationType" factoryName="Python"> <option name="INTERPRETER_OPTIONS" value="" /> <option name="PARENT_ENVS" value="true" /> @@ -1043,9 +892,12 @@ <item index="0" class="java.lang.String" itemvalue="Python.run" /> </list> </component> - <component name="ShelveChangesManager" show_recycled="false"> - <option name="remove_strategy" value="false" /> + <component name="SbtLocalSettings"> + <option name="externalProjectsViewState"> + <projects_view /> + </option> </component> + <component name="ShelveChangesManager" show_recycled="false" /> <component name="SvnConfiguration"> <configuration /> </component> @@ -1054,7 +906,6 @@ <changelist id="7b111a3e-1726-4d52-a9de-f7a3f867dbc7" name="Default" comment="" /> <created>1470923461095</created> <option name="number" value="Default" /> - <option name="presentableId" value="Default" /> <updated>1470923461095</updated> <workItem from="1470923472536" duration="152000" /> <workItem from="1470924240911" duration="7842000" /> @@ -1070,11 +921,11 @@ <workItem from="1471610764951" duration="126000" /> <workItem from="1471611281514" duration="8202000" /> <workItem from="1471622697299" duration="4323000" /> + <workItem from="1471642896082" duration="523000" /> </task> <task id="LOCAL-00001" summary="Refactored and added subsampling file in classifiers module"> <created>1470926189095</created> <option name="number" value="00001" /> - <option name="presentableId" value="LOCAL-00001" /> <option name="project" value="LOCAL" /> <updated>1470926189095</updated> </task> @@ -1082,62 +933,62 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="91161000" /> + <option name="totallyTimeSpent" value="91684000" /> </component> <component name="ToolWindowManager"> <frame x="65" y="24" width="1855" height="1056" extended-state="6" /> <editor active="true" /> <layout> - <window_info id="Palette" 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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Palette	" 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="false" content_ui="tabs" /> - <window_info id="Capture Analysis" 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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> - <window_info id="Maven Projects" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925585" sideWeight="0.5" 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.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Capture Tool" 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="false" content_ui="tabs" /> + <window_info id="UI Designer" 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="false" content_ui="tabs" /> <window_info id="Designer" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19407009" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Palette" 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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="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="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="UI Designer" 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="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.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19407009" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <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="Capture Analysis" 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="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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925585" sideWeight="0.5" order="1" 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.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Capture Tool" 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="false" content_ui="tabs" /> + <window_info id="Maven Projects" 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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925585" sideWeight="0.5" order="2" side_tool="false" 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="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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925585" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> </layout> <layout-to-restore> - <window_info id="Palette" 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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="UI Designer" 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="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <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="Palette	" 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="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="Designer" 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="6" 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.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> + <window_info id="Palette" 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="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="Capture Analysis" 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="4" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925585" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" 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.4" sideWeight="0.5" order="3" 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="5" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> - <window_info id="Maven Projects" 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="5" side_tool="false" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32925585" sideWeight="0.5" 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.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Capture Tool" 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="3" side_tool="false" content_ui="tabs" /> - <window_info id="Designer" 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="6" side_tool="false" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" 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="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="Maven Projects" 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="5" 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.24959569" 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="7" 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.32925585" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="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="UI Designer" 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="4" 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="5" 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.4" sideWeight="0.5" order="3" side_tool="false" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32925585" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> </layout-to-restore> </component> <component name="Vcs.Log.UiProperties"> @@ -1173,382 +1024,285 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/Mumbo.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="7488"> - <caret line="420" column="26" selection-start-line="420" selection-start-column="26" selection-end-line="420" selection-end-column="26" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/Code/MultiView/run.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 /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/Code/MultiView/GetMultiviewDb.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="5706"> - <caret line="317" column="17" selection-start-line="317" selection-start-column="17" selection-end-line="317" selection-end-column="17" /> - <folding> - <element signature="e#0#18#0" expanded="false" /> - <element signature="e#168#254#0" expanded="false" /> - <element signature="e#299#399#0" expanded="false" /> - <element signature="e#451#592#0" expanded="false" /> - <element signature="e#661#1299#0" expanded="false" /> - <element signature="e#1345#1546#0" expanded="false" /> - <element signature="e#1620#3774#0" expanded="false" /> - <element signature="e#3817#4009#0" expanded="false" /> - <element signature="e#4078#4272#0" expanded="false" /> - <element signature="e#5408#6235#0" expanded="false" /> - <element signature="e#6266#7818#0" expanded="false" /> - <element signature="e#18625#18937#0" expanded="false" /> - <element signature="e#18974#19600#0" expanded="false" /> - <element signature="e#19895#19967#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/Classifiers/DecisionTree.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="108"> + <state vertical-scroll-proportion="0.0"> <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/analyzeResults.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="18"> + <state vertical-scroll-proportion="0.0"> <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/Classifiers/SubSampling.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="18"> + <state vertical-scroll-proportion="0.0"> <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/ExecMultiview.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1998"> + <state vertical-scroll-proportion="0.0"> <caret line="112" column="52" selection-start-line="112" selection-start-column="52" selection-end-line="112" selection-end-column="52" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/run.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="18"> + <state vertical-scroll-proportion="0.0"> <caret line="1" column="405" selection-start-line="1" selection-start-column="11" selection-end-line="1" selection-end-column="405" /> - <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/GetMultiviewDb.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <state vertical-scroll-proportion="0.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#18#0" expanded="false" /> - <element signature="e#168#254#0" expanded="false" /> - <element signature="e#299#399#0" expanded="false" /> - <element signature="e#451#592#0" expanded="false" /> - <element signature="e#661#1299#0" expanded="false" /> - <element signature="e#1345#1546#0" expanded="false" /> - <element signature="e#1620#3774#0" expanded="false" /> - <element signature="e#3817#4009#0" expanded="false" /> - <element signature="e#4078#4272#0" expanded="false" /> - <element signature="e#5408#6235#0" expanded="false" /> - <element signature="e#6266#7818#0" expanded="false" /> - <element signature="e#18625#18937#0" expanded="false" /> - <element signature="e#18974#19600#0" expanded="false" /> - <element signature="e#19895#19967#0" expanded="false" /> - </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/Classifiers/DecisionTree.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="108"> + <state vertical-scroll-proportion="0.0"> <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/analyzeResults.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="18"> + <state vertical-scroll-proportion="0.0"> <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/Classifiers/SubSampling.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="18"> + <state vertical-scroll-proportion="0.0"> <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/ExecMultiview.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1998"> + <state vertical-scroll-proportion="0.0"> <caret line="112" column="52" selection-start-line="112" selection-start-column="52" selection-end-line="112" selection-end-column="52" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/run.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <state vertical-scroll-proportion="0.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$/Code/MultiView/GetMultiviewDb.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="5526"> + <state vertical-scroll-proportion="0.0"> <caret line="307" column="42" selection-start-line="307" selection-start-column="42" selection-end-line="307" selection-end-column="42" /> - <folding> - <element signature="e#0#18#0" expanded="false" /> - <element signature="e#168#254#0" expanded="false" /> - <element signature="e#299#399#0" expanded="false" /> - <element signature="e#451#592#0" expanded="false" /> - <element signature="e#661#1299#0" expanded="false" /> - <element signature="e#1345#1546#0" expanded="false" /> - <element signature="e#1620#3774#0" expanded="false" /> - <element signature="e#3817#4009#0" expanded="false" /> - <element signature="e#4078#4272#0" expanded="false" /> - <element signature="e#5408#6235#0" expanded="false" /> - <element signature="e#6266#7818#0" expanded="false" /> - <element signature="e#18625#18937#0" expanded="false" /> - <element signature="e#18974#19600#0" expanded="false" /> - <element signature="e#19895#19967#0" expanded="false" /> - </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/Classifiers/DecisionTree.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="108"> + <state vertical-scroll-proportion="0.0"> <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/analyzeResults.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="18"> + <state vertical-scroll-proportion="0.0"> <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/Classifiers/SubSampling.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="18"> + <state vertical-scroll-proportion="0.0"> <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/ExecMultiview.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1998"> + <state vertical-scroll-proportion="0.0"> <caret line="112" column="52" selection-start-line="112" selection-start-column="52" selection-end-line="112" selection-end-column="52" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Results/Results-FeatExtract-All/2016_02_05-CT-Mini-ClassLabels.csv"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="540"> + <state vertical-scroll-proportion="0.0"> <caret line="30" column="32" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/run.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <state vertical-scroll-proportion="0.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$/Results/Results-FeatExtract-All/2016_02_05-CT-Mini-ClassLabels.csv"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="540"> + <state vertical-scroll-proportion="0.0"> <caret line="30" column="32" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/Classifiers/SubSampling.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="18"> + <state vertical-scroll-proportion="0.0"> <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" /> </state> </provider> </entry> <entry file="file://$USER_HOME$/anaconda2/lib/python2.7/site-packages/sklearn/cross_validation.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1033"> + <state vertical-scroll-proportion="0.0"> <caret line="1791" column="4" selection-start-line="1791" selection-start-column="4" selection-end-line="1791" selection-end-column="4" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/Classifiers/DecisionTree.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="270"> + <state vertical-scroll-proportion="0.0"> <caret line="19" column="70" selection-start-line="19" selection-start-column="70" selection-end-line="19" selection-end-column="70" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/__init__.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <state vertical-scroll-proportion="0.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$/Code/MultiView/Fusion/Methods/MonoviewClassifiers/__init__.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <state vertical-scroll-proportion="0.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$/Code/MultiView/Fusion/analyzeResults.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="288"> + <state vertical-scroll-proportion="0.0"> <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/MonoviewClassifiers/RandomForest.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="180"> + <state vertical-scroll-proportion="0.0"> <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="11" selection-end-column="93" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/MonoviewClassifiers/DecisionTree.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="180"> + <state vertical-scroll-proportion="0.0"> <caret line="10" column="61" selection-start-line="10" selection-start-column="61" selection-end-line="10" selection-end-column="61" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/MonoviewClassifiers/SGD.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="270"> + <state vertical-scroll-proportion="0.0"> <caret line="15" column="82" selection-start-line="15" selection-start-column="82" selection-end-line="15" selection-end-column="82" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/MonoviewClassifiers/SVC.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="216"> + <state vertical-scroll-proportion="0.0"> <caret line="12" column="54" selection-start-line="12" selection-start-column="54" selection-end-line="12" selection-end-column="54" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/analyzeResults.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="2808"> + <state vertical-scroll-proportion="0.0"> <caret line="163" column="21" selection-start-line="163" selection-start-column="21" selection-end-line="163" selection-end-column="21" /> - <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/run.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="18"> + <state vertical-scroll-proportion="0.0"> <caret line="1" column="184" selection-start-line="1" selection-start-column="184" selection-end-line="1" selection-end-column="184" /> - <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/GetMultiviewDb.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="648"> + <state vertical-scroll-proportion="0.0"> <caret line="118" column="58" selection-start-line="118" selection-start-column="58" selection-end-line="118" selection-end-column="58" /> - <folding> - <element signature="e#0#18#0" expanded="false" /> - <element signature="e#168#254#0" expanded="false" /> - <element signature="e#299#399#0" expanded="false" /> - <element signature="e#451#592#0" expanded="false" /> - <element signature="e#661#1299#0" expanded="false" /> - <element signature="e#1345#1546#0" expanded="false" /> - <element signature="e#1620#3774#0" expanded="false" /> - <element signature="e#3817#4009#0" expanded="false" /> - <element signature="e#4078#4272#0" expanded="false" /> - <element signature="e#5408#6235#0" expanded="false" /> - <element signature="e#6266#7818#0" expanded="false" /> - <element signature="e#18625#18937#0" expanded="false" /> - <element signature="e#18974#19600#0" expanded="false" /> - <element signature="e#19895#19967#0" expanded="false" /> - </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MonoView/ExportResults.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <state vertical-scroll-proportion="0.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$/Code/MonoView/ExecPlot.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <state vertical-scroll-proportion="0.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$/Code/MonoView/run.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="18"> + <state vertical-scroll-proportion="0.0"> <caret line="1" column="188" selection-start-line="1" selection-start-column="188" selection-end-line="1" selection-end-column="188" /> - <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MonoView/ClassifMonoView.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="144"> + <state vertical-scroll-proportion="0.0"> <caret line="138" column="12" selection-start-line="138" selection-start-column="12" selection-end-line="138" selection-end-column="12" /> - <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/__init__.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <state vertical-scroll-proportion="0.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$/Code/MultiView/Mumbo/Classifiers/__init__.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <state vertical-scroll-proportion="0.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$/Code/MultiView/Mumbo/Mumbo.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="342"> - <caret line="253" column="24" selection-start-line="253" selection-start-column="24" selection-end-line="253" selection-end-column="24" /> + <state vertical-scroll-proportion="0.0"> + <caret line="160" column="24" selection-start-line="160" selection-start-column="24" selection-end-line="160" selection-end-column="24" /> <folding> - <element signature="e#0#18#0" expanded="true" /> + <element signature="e#0#18#0" expanded="false" /> </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Mumbo/__init__.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <state vertical-scroll-proportion="0.0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding /> </state> @@ -1556,18 +1310,18 @@ </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/ExecMultiview.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="162"> - <caret line="9" column="15" selection-start-line="9" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0"> + <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" /> <folding> - <element signature="e#0#10#0" expanded="true" /> + <element signature="e#0#10#0" expanded="false" /> </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MonoView/ExecClassifMonoView.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="702"> - <caret line="72" column="59" selection-start-line="72" selection-start-column="59" selection-end-line="72" selection-end-column="59" /> + <state vertical-scroll-proportion="0.0"> + <caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" /> <folding> <element signature="e#113#181#0" expanded="true" /> </folding> @@ -1576,33 +1330,33 @@ </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/EarlyFusion.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="468"> - <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" /> - <folding> - <element signature="e#45#71#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="0.0"> + <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" /> + <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Fusion.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="36"> - <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0"> + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/LateFusion.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-162"> - <caret line="26" column="33" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" /> - <folding /> + <state vertical-scroll-proportion="0.0"> + <caret line="69" column="17" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" /> + <folding> + <marker date="1471642808835" expanded="false" signature="45:152" placeholder="import ..." /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/MultiView/Fusion/Methods/__init__.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <state vertical-scroll-proportion="0.0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding /> </state> @@ -1610,22 +1364,38 @@ </entry> <entry file="file://$PROJECT_DIR$/Code/MonoView/__init__.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="50" selection-start-line="0" selection-start-column="50" selection-end-line="0" selection-end-column="50" /> + <state vertical-scroll-proportion="0.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$/Code/Versions.py"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Code/ExecClassif.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="576"> - <caret line="80" column="14" selection-start-line="80" selection-start-column="14" selection-end-line="80" selection-end-column="14" /> + <state vertical-scroll-proportion="0.0"> + <caret line="58" column="0" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" /> <folding> <element signature="e#0#15#0" expanded="true" /> </folding> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/.gitignore"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.05856833"> + <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" /> + <folding /> + </state> + </provider> + </entry> </component> <component name="masterDetails"> <states> @@ -1655,7 +1425,7 @@ </state> <state key="GlobalLibrariesConfigurable.UI"> <settings> - <last-edited>Python 2.7.12 (/usr/bin/python2) interpreter library</last-edited> + <last-edited>Python 2.7.11 (~/anaconda2/bin/python2.7) interpreter library</last-edited> <splitter-proportions> <option name="proportions"> <list> @@ -1667,7 +1437,7 @@ </state> <state key="JdkListConfigurable.UI"> <settings> - <last-edited>Python 2.7.12 (/usr/bin/python2)</last-edited> + <last-edited>Python 2.7.11 (~/anaconda2/bin/python2.7)</last-edited> <splitter-proportions> <option name="proportions"> <list> diff --git a/Code/.gitignore b/Code/.gitignore deleted file mode 100644 index 3196fcb430961df787b4b8164fff89ab524b2644..0000000000000000000000000000000000000000 --- a/Code/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -../idea/ -../multiview-machine-learning-omis.iml \ No newline at end of file diff --git a/Code/Baptiste/mumbo.py b/Code/Baptiste/mumbo.py deleted file mode 100644 index fb778c82731972269cbbbc6a602dcd59f259c4ea..0000000000000000000000000000000000000000 --- a/Code/Baptiste/mumbo.py +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env python -# -*- encoding: utf-8 - -# Work in progress \ No newline at end of file diff --git a/Code/Niko/HelperFunctions/Versions.py b/Code/Versions.py similarity index 100% rename from Code/Niko/HelperFunctions/Versions.py rename to Code/Versions.py