From e7e4b62435a59798d1ff897afafc5dae82d9b039 Mon Sep 17 00:00:00 2001
From: hl00586 <hl00586@surrey.ac.uk>
Date: Fri, 6 Dec 2019 19:08:58 +0000
Subject: [PATCH] TLH
---
.DS_Store | Bin 8196 -> 8196 bytes
.gitignore | 137 ++++++++++++++++++++++++++++++++++
.idea/workspace.xml | 29 ++++++-
config/configuration/test.ini | 4 +-
images/.DS_Store | Bin 6148 -> 6148 bytes
5 files changed, 164 insertions(+), 6 deletions(-)
create mode 100644 .gitignore
diff --git a/.DS_Store b/.DS_Store
index 0f09ec83ffa1bd879e35c3c94c08f55b483924ab..3c5995d580039c6173a63b75f071495d94c8992f 100644
GIT binary patch
delta 91
zcmZp1XmOa}&nUeyU^hRb^kg0Z%gOu#;*;wHCa_wX>nIpao*?E765%NeF3QWv&r4@u
uU|`(rBw)eBZfI_%qhM@0d7_xp=EFkzESuRSzOyiDOx`0bwV6faH4^}hHyLCA
delta 54
zcmV-60LlM^K!iY$PXQURP`eKS8Iv&)8j~gvAG2B!H3E~U6-l$$6E6g@c@+V(2N?GR
MvlABd0kL@!0n+Lb7ytkO
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..65b06e4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,137 @@
+# Created by https://www.gitignore.io/api/macos,python
+# Edit at https://www.gitignore.io/?templates=macos,python
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+# Usually these files are written by a python script from a template
+# before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# pyenv
+.python-version
+
+# pipenv
+# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+# However, in case of collaboration, if having platform-specific dependencies or dependencies
+# having no cross-platform support, pipenv may install dependencies that don't work, or not
+# install all needed dependencies.
+#Pipfile.lock
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# End of https://www.gitignore.io/api/macos,python
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8773fc1..73591a3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="99550bc5-aa3b-44b3-94d7-b84afc45844f" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/learn_consistent.py" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/split_mnit.py" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/config/configuration/test.ini" beforeDir="false" afterPath="$PROJECT_DIR$/config/configuration/test.ini" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -33,11 +31,14 @@
</list>
</option>
</component>
- <component name="RunManager" selected="Python.learn_consistent">
+ <component name="RunManager" selected="Python.test">
<configuration name="learn_consistent" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="Task_likelihood" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
+ <envs>
+ <env name="PYTHONUNBUFFERED" value="1" />
+ </envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="true" />
@@ -73,12 +74,32 @@
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
+ <configuration name="test" type="PythonConfigurationType" factoryName="Python" temporary="true">
+ <module name="Task_likelihood" />
+ <option name="INTERPRETER_OPTIONS" value="" />
+ <option name="PARENT_ENVS" value="true" />
+ <option name="SDK_HOME" value="" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="IS_MODULE_SDK" value="true" />
+ <option name="ADD_CONTENT_ROOTS" value="true" />
+ <option name="ADD_SOURCE_ROOTS" value="true" />
+ <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test.py" />
+ <option name="PARAMETERS" value="" />
+ <option name="SHOW_COMMAND_LINE" value="true" />
+ <option name="EMULATE_TERMINAL" value="false" />
+ <option name="MODULE_MODE" value="false" />
+ <option name="REDIRECT_INPUT" value="false" />
+ <option name="INPUT_FILE" value="" />
+ <method v="2" />
+ </configuration>
<list>
<item itemvalue="Python.learn_consistent" />
<item itemvalue="Python.split_mnit" />
+ <item itemvalue="Python.test" />
</list>
<recent_temporary>
<list>
+ <item itemvalue="Python.test" />
<item itemvalue="Python.learn_consistent" />
<item itemvalue="Python.split_mnit" />
</list>
diff --git a/config/configuration/test.ini b/config/configuration/test.ini
index f6b6cc7..c3321e7 100644
--- a/config/configuration/test.ini
+++ b/config/configuration/test.ini
@@ -9,7 +9,7 @@ task_type = Sequential_split
# task_labels = |0,1,2,3,4,5,6,7,8,9
# task_labels = |0,1,2|3,4,5|6,7|8,9
task_labels = |0,1|2,3|4,5|6,7|8,9
-dataset_name = mnist
+dataset_name = cifar10
[Model Setting]
model_type = NN
@@ -18,7 +18,7 @@ model_archi = MLP
hidden_dim = 200
num_layers = 4
-is_conv = False
+is_conv = True
[Training Setting]
batch_size = 128
diff --git a/images/.DS_Store b/images/.DS_Store
index 3abeaa77f0a48e644d7cbb595ac02464f0cd336c..c8a177575fed8f2fced5988bae5b0726a6162537 100644
GIT binary patch
delta 122
zcmZoMXfc=|&e%S&P;8=}q9_vs0|O%ig8&0V4nqlp9zy{`9z*)XgX)tFL|6>D7>XED
z8HyQ7ktIEI@{^Nt@{@oXfw~xFfwb{|FkoQV*yGN=nVmy`gRy<%!SBqI`9*XY88$nL
K9A=)_zybjBxFAgc
delta 74
zcmZoMXfc=|&e%4wP;8=}q9`K+0|O8XFfiyb6fop5q<iM%Cr|vS&d9j&fIIsnMw89#
b90DASZ5uy+XP(S2qRR@>aA32o$YEvxu_hBy
--
GitLab