merge conflicts

1 files changed, 46 insertions, 0 deletions

diff --git a/paper/main.tex b/paper/main.tex
new file mode 100644
index 0000000..0b33bdd
--- /dev/null
+++ b/paper/main.tex
@@ -0,0 +1,46 @@
+\documentclass[10pt]{article}
+\usepackage{nips15submit_e}
+\usepackage{amsmath, amssymb, amsthm, bbm, microtype}
+\usepackage[utf8x]{inputenc}
+\usepackage[capitalize, noabbrev]{cleveref}
+\usepackage[pagebackref=false,breaklinks=true,colorlinks=true]{hyperref}
+\usepackage{natbib}
+\usepackage{url}
+
+\DeclareMathOperator{\E}{\mathbb{E}}
+\let\P\relax
+\DeclareMathOperator{\P}{\mathbb{P}}
+\newcommand{\ex}[1]{\E\left[#1\right]}
+\newcommand{\prob}[1]{\P\left[#1\right]}
+\newcommand{\reals}{\mathbb{R}}
+\newcommand{\ints}{\mathbb{N}}
+\renewcommand{\O}{\mathcal{O}}
+
+\newtheorem{proposition}{Proposition}
+\newtheorem{corollary}{Corollary}
+\newtheorem{problem}{Problem}
+\newtheorem{theorem}{Theorem}
+\newtheorem{claim}{Claim}
+\newtheorem{remark}{Remark}
+
+\title{Optimizing Submodular Functions in the Face of Uncertainty}
+\author{}
+\date{}
+
+\begin{document}
+\maketitle
+
+\section{Introduction}
+\input{sections/introduction.tex}
+
+\section{Learning vs. Optimizing}
+\input{sections/negative.tex}
+
+\section{Positive results}
+\input{sections/positive.tex}
+
+\bibliographystyle{abbrv}
+\bibliography{optimize}
+
+
+\end{document}