diff --git a/.gitignore b/.gitignore index 847188797d15fa061b565f165870e619e6c67b72..d802631bb34cff67c6d7867f4be70d129759b5a5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ auto *.out *.pdf *.synctex.gz +*.run.xml +*-blx.bib diff --git a/graph3.tex b/graph3.tex index 51efd275156035eebd2f9481ac7181592427309e..006f261647356ea257e7abaf45cfb6377d77746b 100644 --- a/graph3.tex +++ b/graph3.tex @@ -8,8 +8,6 @@ \begin{document} \begin{tikzpicture} -\draw[-] (-9,5) -- (-1,5) node[pos=.5,sloped,above] {Jupyter - Sketch with Active Documents}; - %Mother Ship %\draw[fill=blue!10] (-8,0) rectangle (-10, 3); %\draw[style=thick, fill=cyan] (-9.75, 2) rectangle (-8.25, 2.5); diff --git a/jupyther.tex b/jupyther.tex index e3813b5f1a72172b2c12bd732307cb3c957250b5..fd201fc385108f22ee030ed138468dc22c76c58e 100644 --- a/jupyther.tex +++ b/jupyther.tex @@ -21,8 +21,11 @@ qualitatively new direction, providing a web-based application suitable for capt whole computation process: developing, documenting, and executing code, as well as communicating the results. The Jupyter notebook combines two components: \begin{enumerate} -\item A web application: a browser-based tool for interactive authoring of documents which combine explanatory text, mathematics, computations and their rich media output. \\ -\item Notebook documents: a representation of all content visible in the web application, including inputs and outputs of the computations, explanatory text, mathematics, images, and rich media representations of objects. +\item A web application: a browser-based tool for interactive authoring of documents which + combine explanatory text, mathematics, computations and their rich media output. +\item Notebook documents: a representation of all content visible in the web application, + including inputs and outputs of the computations, explanatory text, mathematics, images, + and rich media representations of objects. \end{enumerate} \ednote{AM: How much in detail should I go?} \ednote{AM: Notebook user interface - relevant?} @@ -54,7 +57,7 @@ directory or to create a new notebook. \subsubsection{Creating a new notebook document} -A new notebook may be created at any time, either from the dashboard, or using the File ‣ +A new notebook may be created at any time, either from the dashboard, or using the File | New menu option from within an active notebook. The new notebook is created within the same directory and will open in a new browser tab. It will also be reflected as a new entry in the notebook list on the dashboard. diff --git a/report.tex b/report.tex index 5ee273894fa01162e0db96ce2d334657e1a2c2ba..d8797d8db3cc6753da6b8602a8b62fe883a84023 100644 --- a/report.tex +++ b/report.tex @@ -1,8 +1,14 @@ \documentclass{deliverablereport} + \usepackage[style=alphabetic,backend=bibtex]{biblatex} \addbibresource{kwarc.bib} \addbibresource{rest.bib} + +\usepackage{tikz} +\usepackage{standalone} \usepackage[show]{ed} +\usepackage{listings} +\lstset{columns=fullflexible,basicstyle=\sf,language=Python} % Variant: we could just provide the deliverable label as in the % proposal, and fetch all the information from final.pdata @@ -28,6 +34,17 @@ sdfsdfsdfsdfsdf \end{newpart} \section{Next Steps}\label{sec:steps} +\begin{figure}[ht] + \input{graph2} + \caption{graph 2}\label{fig:graph2} +\end{figure} + +\begin{figure}[ht] + \input{graph3} + \caption{Jupyter - Sketch with Active Documents}\label{fig:graph3} +\end{figure} + + \section{Conclusion}\label{sec:conc} \printbibliography \end{document}