Reorganize prior to restarting on slightly different track

oxinabox · May 4, 2018 · 0ca7e40 · 0ca7e40
1 parent c3cc89c
commit 0ca7e40
Show file tree

Hide file tree

Showing 19 changed files with 40 additions and 21 deletions.
diff --git a/data/munroe_datadep.jl b/data/munroe_datadep.jl
diff --git a/expr/ExtrapolationAna.ipynb → expr/round1/ExtrapolationAna.ipynb b/expr/ExtrapolationAna.ipynb → expr/round1/ExtrapolationAna.ipynb
diff --git a/expr/PaperGen.ipynb → expr/round1/PaperGen.ipynb b/expr/PaperGen.ipynb → expr/round1/PaperGen.ipynb
diff --git a/expr/TestSet Eval.ipynb → expr/round1/TestSet Eval.ipynb b/expr/TestSet Eval.ipynb → expr/round1/TestSet Eval.ipynb
diff --git a/expr/Validation check.ipynb → expr/round1/Validation check.ipynb b/expr/Validation check.ipynb → expr/round1/Validation check.ipynb
diff --git a/expr/col2term_bigram.jl → expr/round1/col2term_bigram.jl b/expr/col2term_bigram.jl → expr/round1/col2term_bigram.jl
diff --git a/expr/high_dims_ana.ipynb → expr/round1/high_dims_ana.ipynb b/expr/high_dims_ana.ipynb → expr/round1/high_dims_ana.ipynb
diff --git a/expr/independence_check.jl.ipynb → expr/round1/independence_check.jl.ipynb b/expr/independence_check.jl.ipynb → expr/round1/independence_check.jl.ipynb
diff --git a/expr/models_datadep.jl → expr/round1/models_datadep.jl b/expr/models_datadep.jl → expr/round1/models_datadep.jl
diff --git a/expr/reeval_models.jl → expr/round1/reeval_models.jl b/expr/reeval_models.jl → expr/round1/reeval_models.jl
diff --git a/expr/run_col2term.jl → expr/round1/run_col2term.jl b/expr/run_col2term.jl → expr/round1/run_col2term.jl
diff --git a/expr/run_hyperparam_search_term2col_dist.jl → ...d1/run_hyperparam_search_term2col_dist.jl b/expr/run_hyperparam_search_term2col_dist.jl → ...d1/run_hyperparam_search_term2col_dist.jl
diff --git a/expr/run_term2col.jl → expr/round1/run_term2col.jl b/expr/run_term2col.jl → expr/round1/run_term2col.jl
diff --git a/expr/run_term2col_dist.jl → expr/round1/run_term2col_dist.jl b/expr/run_term2col_dist.jl → expr/round1/run_term2col_dist.jl
diff --git a/expr/run_term2col_dist_extrapolate.jl → expr/round1/run_term2col_dist_extrapolate.jl b/expr/run_term2col_dist_extrapolate.jl → expr/round1/run_term2col_dist_extrapolate.jl
diff --git a/expr/run_term2col_dist_noml.jl → expr/round1/run_term2col_dist_noml.jl b/expr/run_term2col_dist_noml.jl → expr/round1/run_term2col_dist_noml.jl
diff --git a/expr/term2col.jl → expr/round1/term2col.jl b/expr/term2col.jl → expr/round1/term2col.jl
diff --git a/src/ColoringNames.jl b/src/ColoringNames.jl
@@ -19,6 +19,7 @@ function hsv2colorant(hsvs::AbstractMatrix)
     mapslices(hsv2colorant, hsvs, 2)
  end
 
+include("init_datadeps.jl")
 
 include("util.jl")
 include("tf_extra.jl")

diff --git a/src/init_datadeps.jl b/src/init_datadeps.jl
@@ -0,0 +1,39 @@
+function __init__()
+    RegisterDataDep("Munroe Color Corpus",
+    """
+    This is XKCD color data (https://blog.xkcd.com/2010/05/03/color-survey-results/)
+    collected by Randall Munroe, in 2010.
+    with the results from all the participants.
+
+    With some filtering and spelling normalistation from
+    Brian McMahan and Matthew Stone,
+    "A Bayesian Model of Grounded Color Semantics",
+    Transactions of the ACL, 2015.
+    http://mcmahan.io/lux/
+
+    With some minor data munging into nice shape, by Lyndon White in 2016.
+
+    Use of this data remains the responsibility of the user.
+    """,
+    "https://cloudstor.aarnet.edu.au/plus/s/dwz6rsdG8tOgBA9/download",
+    "00488395712f92d4c02c90672ccc302887926cb42331f20227bc9fd727714c49";
+    post_fetch_method=unpack
+    )
+
+    RegisterDataDep("word2vec 300d",
+    """
+    Pretrained Word2Vec Word emeddings
+    Website: https://code.google.com/archive/p/word2vec/
+    Author: Mikolov et al.
+    Year: 2013
+
+    Pre-trained vectors trained on part of Google News dataset (about 100 billion words). The model contains 300-dimensional vectors for 3 million words and phrases.
+
+    Paper:
+        Tomas Mikolov, Ilya Sutskever, Kai Chen, Greg Corrado, and Jeffrey Dean. Distributed Representations of Words and Phrases and their Compositionality. In Proceedings of NIPS, 2013.
+    """,
+    "https://s3.amazonaws.com/dl4j-distribution/GoogleNews-vectors-negative300.bin.gz";
+    post_fetch_method=unpack
+    )
+
+end