add Integrationspreis, exclude references for Facebook, set Tensorflow-publication to "submitted"

Author: mschrimpf

Martin_Schrimpf-CV-academic.pdf

@@ -8,11 +8,12 @@ @article{recurrency_occlusion
 @article{should_i_use_tensorflow,
     author =       "Martin Schrimpf",
     title =        "Should I use Tensorflow",
+    journal =      "submitted", 
+    year =         "2016",
+}
     archivePrefix = "arXiv",
     eprint =       {TODO}, 
     primaryClass = "cs.AI",
-    year =         "2016",
-}
 
 @MastersThesis{bachelors_thesis,
     type =         "Bachelor's Thesis", 

bibliography.bib

@@ -12,7 +12,7 @@
 	84405 Dorfen\\%
 	Germany}
 \setEmail{%
-	martin.schrimpf@tum.de}
+	martin.schrimpf@outlook.com}
 \setMobile{%
 	+49 174 9946449}
 \setGithub{%
@@ -99,8 +99,8 @@
 Kreiman Lab, Harvard Medical School
 }{% 5: Description
 Research at the bridge of machine learning, neuroscience and psychology with a focus on the role of recurrent connections.
-We improved object detection performance on occluded objects from 45\% with Alexnet to 74\% with our models and offered a first possible application of recurrency in the human brain [paper submitted].
-A follow-up project focuses on the role of scene context for object detection
+We improved object detection performance on occluded objects from 45\% with Alexnet to 74\% with our models and offered a first possible application of recurrency in the human brain.
+We are also investigating the robustness of neural networks and the role of scene context for object detection
 }{% 6: Technologies
 Matlab, Python, keras, Theano, Linux, ECoG
 }
@@ -257,6 +257,18 @@
 }{% 6: Technologies
 }
 
+\block%
+{% 1: Time frame start
+2016
+}{% 2: Time frame end
+}{% 3: Activity
+Integrationspreis
+}{% 4: Organisation
+Government of Swabia
+}{% 5: Description
+}{% 6: Technologies
+}
+
 \block%
 {% 1: Time frame start
 2016
@@ -295,8 +307,9 @@
 
 \block%
 {% 1: Time frame start
-201\{3,4,5,6\}
+2013
 }{% 2: Time frame end
+2016
 }{% 3: Activity
 e-fellows.net scholarship
 }{% 4: Organisation
@@ -339,8 +352,9 @@
 
 \block%
 {% 1: Time frame start
-201\{5,6\}
+2015
 }{% 2: Time frame end
+2016
 }{% 3: Activity
 MINGA Mentor for International Students
 }{% 4: Organisation
@@ -402,7 +416,7 @@
 }{% 4: Organisation
 City University of New York
 }{% 5: Description
-Behavioral experiments and data analysis on the identification of occluded objects
+Behavioral experiments and data analysis on the identification of occluded objects (MIT Summer Research Program)
 }{% 6: Technologies
 }
 }
@@ -423,6 +437,7 @@
 }{% 6: Technologies
 }
 
+\iffalse
 \block%
 {% 1: Time frame start
 }{% 2: Time frame end
@@ -444,4 +459,16 @@
 }{% 5: Description
 }{% 6: Technologies
 }
+\fi
+
+\block%
+{% 1: Time frame start
+}{% 2: Time frame end
+}{% 3: who
+Prof. Dr. Alexander Knapp
+}{% 4: Organisation
+Software and Systems Engineering, Augsburg University
+}{% 5: Description
+}{% 6: Technologies
+}
 }

content.tex

@@ -66,6 +66,8 @@
 
 \usepackage[outline]{contour}% http://ctan.org/pkg/contour
 
+\usepackage{xstring} % string length
+
 
 \input{trim_spaces.tex}
 
@@ -88,7 +90,15 @@
 \begin{tabular}{p{0.15\linewidth} l}%
 \ifthenelse{\isempty{#2}}%
 {#1}%
-{\begin{tabular}[t]{@{}l@{}}#1\\ - #2\end{tabular}}%
+{%
+\begin{tabular}[t]{@{}l@{}}%
+#1%
+\StrLen{#1}[\fromstringlen]%
+\ifthenelse{\fromstringlen > 5}{\\}{}%
+ - %
+#2%
+\end{tabular}%
+}%
 %
 &%
 %