Skip to content

Lägg till material om defaultparametrar för funktioner #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/variables/slides-default/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
notes.pdf
slides.pdf
22 changes: 22 additions & 0 deletions modules/variables/slides-default/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.PHONY: all
all: notes.pdf slides.pdf

LATEXFLAGS+= -shell-escape

SRC+= preamble.tex
SRC+= abstract.tex contents.tex

notes.pdf: notes.tex
notes.pdf: ${SRC}

slides.pdf: slides.tex
slides.pdf: ${SRC}


.PHONY: clean
clean:
${RM} notes.pdf slides.pdf


INCLUDE_MAKEFILES=../../..//makefiles
include ${INCLUDE_MAKEFILES}/tex.mk
22 changes: 22 additions & 0 deletions modules/variables/slides-default/abstract.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
% What's the problem?
% Why is it a problem? Research gap left by other approaches?
% Why is it important? Why care?
% What's the approach? How to solve the problem?
% What's the findings? How was it evaluated, what are the results, limitations,
% what remains to be done?

% XXX Summary
\emph{Summary:}
\dots

% XXX Motivation and intended learning outcomes
\emph{Intended learning outcomes:}
\dots

% XXX Prerequisites
\emph{Prerequisites:}
\dots

% XXX Reading material
\emph{Reading:}
\dots
34 changes: 34 additions & 0 deletions modules/variables/slides-default/contents.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
\mode*

\section{Fördelar med funktioner}

\begin{frame}[fragile]
\begin{question}
\begin{itemize}
\item Vad är fördelarna med funktioner? Sant eller falskt:
\begin{enumerate}
\item<+> Det gör programmet snabbare att exekvera.
\item<+> Det gör programmet enklare att läsa.
\item<+> Det kan göra programmet kortare.
\item<+> Det underlättar en överblick över programmet.
\item<+> Det gör programmet mer användarvänligt.
\end{enumerate}
\end{itemize}
\end{question}
\end{frame}


\section{Defaultparametrar}

\begin{frame}[fragile]
\begin{example}
\inputminted{python}{examples/hello.py}
\end{example}
\end{frame}

\begin{frame}[fragile]
\begin{example}
\inputminted[firstline=7,lastline=15]{python}{examples/area.py}
\end{example}
\end{frame}

23 changes: 23 additions & 0 deletions modules/variables/slides-default/examples/area-default.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
"""Program som beräknar area"""

import math

def area_rekt(höjd, bredd):
"""Beräknar arean av en rektangel."""
return höjd * bredd

def area_cirkel(radie, pi=3.14):
"""Beräknar arean av cirkel med radien radie."""
return radie**2 * pi

def main():
"""Huvudprogrammet"""
r = 4
print(f"area_cirkel({r}) = {area_cirkel(r)}")
print(f"area_cirkel({r}, {math.pi}) = {area_cirkel(r, math.pi)}")

b = 2
h = 3
print(f"area_rekt({b}, {h}) = {area_rekt(b, h)}")

main()
20 changes: 20 additions & 0 deletions modules/variables/slides-default/examples/area.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
"""Program som beräknar area"""

def area_rekt(höjd, bredd):
"""Beräknar arean av en rektangel."""
return höjd * bredd

def area_cirkel(radie):
"""Beräknar arean av cirkel med radien radie."""
return radie**2 * 3.14

def main():
"""Huvudprogrammet"""
r = 4
print(f"area_cirkel({r}) = {area_cirkel(r)}")

b = 2
h = 3
print(f"area_rekt({b}, {h}) = {area_rekt(b, h)}")

main()
8 changes: 8 additions & 0 deletions modules/variables/slides-default/examples/hello-default.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
"""Ett program som visar defaultparametrar"""

def hello(who="World"):
"""Skriver ut 'Hello {who}!', om who inte anges används 'World'"""
print(f"Hello {who}!")

hello()
hello("Daniel")
8 changes: 8 additions & 0 deletions modules/variables/slides-default/examples/hello.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
"""Ett program som visar defaultparametrar"""

def hello(who):
"""Skriver ut 'Hello {who}!', om who inte anges används 'World'"""
print(f"Hello {who}!")

hello("World")
hello("Daniel")
45 changes: 45 additions & 0 deletions modules/variables/slides-default/notes.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
\documentclass{article}

\usepackage[hyphens]{url}
\usepackage[hidelinks]{hyperref}

\input{preamble.tex}

\usepackage[noamsthm,notheorems]{beamerarticle}
\setjobnamebeamerversion{slides}

%\usepackage{authblk}
%\let\institute\affil

\declaretheorem[numbered=unless unique,style=theorem]{theorem}
\declaretheorem[numbered=unless unique,style=definition]{definition}
\declaretheorem[numbered=unless unique,style=definition]{assumption}
\declaretheorem[numbered=unless unique,style=definition]{protocol}
\declaretheorem[numbered=unless unique,style=example]{example}
%\declaretheorem[style=definition,numbered=unless unique,
% name=Example,refname={example,examples}]{example}
\declaretheorem[numbered=unless unique,style=remark]{remark}
\declaretheorem[numbered=unless unique,style=remark]{idea}
\declaretheorem[numbered=unless unique,style=exercise]{exercise}
\declaretheorem[numbered=unless unique,style=exercise]{question}
\declaretheorem[numbered=unless unique,style=solution]{solution}

\begin{document}
\title{%
Mer om funktioner
}
\author{Daniel Bosk}
\institute{%
KTH EECS
}

\maketitle

\begin{abstract}
\input{abstract.tex}
\end{abstract}

\input{contents.tex}

\printbibliography
\end{document}
43 changes: 43 additions & 0 deletions modules/variables/slides-default/preamble.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage[swedish]{babel}
\usepackage{booktabs}

\usepackage[natbib,style=alphabetic,maxbibnames=99]{biblatex}
\addbibresource{bibliography.bib}

\usepackage[all]{foreign}
\renewcommand{\foreignfullfont}{}
\renewcommand{\foreignabbrfont}{}

\usepackage{newclude}
\usepackage{import}

\usepackage[strict]{csquotes}
\usepackage[single]{acro}

\usepackage{subcaption}

\usepackage[noend]{algpseudocode}
\usepackage{xparse}

\let\email\texttt

\usepackage[outputdir=ltxobj]{minted}
\setminted{autogobble}

\usepackage{pythontex}
\setpythontexoutputdir{.}
\setpythontexworkingdir{..}

\usepackage{amsmath}
\usepackage{amssymb}
\usepackage{mathtools}
\usepackage{amsthm}
\usepackage{thmtools}
\usepackage[unq]{unique}
\DeclareMathOperator{\powerset}{\mathcal{P}}

\usepackage[binary-units]{siunitx}

\usepackage[capitalize]{cleveref}
118 changes: 118 additions & 0 deletions modules/variables/slides-default/slides.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
\documentclass[ignoreframetext]{beamer}
\input{preamble.tex}

\usetheme{Berlin}
\setbeamertemplate{footline}%{miniframes theme}
{%
\begin{beamercolorbox}[colsep=1.5pt]{upper separation line foot}
\end{beamercolorbox}
\begin{beamercolorbox}[ht=2.5ex,dp=1.125ex,%
leftskip=.3cm,rightskip=.3cm plus1fil]{author in head/foot}%
\leavevmode{\usebeamerfont{author in head/foot}\insertshortauthor}%
\hfill%
{\usebeamerfont{institute in head/foot}\usebeamercolor[fg]{institute in head/foot}\insertshortinstitute}%
\end{beamercolorbox}%
\begin{beamercolorbox}[ht=2.5ex,dp=1.125ex,%
leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}%
{\usebeamerfont{title in head/foot}\insertshorttitle} \hfill \insertframenumber%
\end{beamercolorbox}%
\begin{beamercolorbox}[colsep=1.5pt]{lower separation line foot}
\end{beamercolorbox}
}
\setbeamercovered{transparent}
\setbeamertemplate{bibliography item}[text]

\AtBeginSection[]{%
\begin{frame}<beamer>
\tableofcontents[currentsection]
\end{frame}
}

\ProvideDocumentEnvironment{assumption}{o}{%
\IfValueTF{#1}{%
\begin{block}{Assumption: #1}
}{%
\begin{block}{Assumption}
}
}{%
\end{block}
}

\ProvideDocumentEnvironment{protocol}{o}{%
\IfValueTF{#1}{%
\begin{block}{Protocol: #1}
}{%
\begin{block}{Protocol}
}
}{%
\end{block}
}

\ProvideDocumentEnvironment{remark}{o}{%
\IfValueTF{#1}{%
\begin{alertblock}{Note: #1}
}{%
\begin{alertblock}{Note}
}
}{%
\end{alertblock}
}

\ProvideDocumentEnvironment{idea}{o}{%
\IfValueTF{#1}{%
\begin{block}{Idea: #1}
}{%
\begin{block}{Idea}
}
}{%
\end{block}
}

\ProvideDocumentEnvironment{question}{o}{%
\setbeamercolor{block body}{bg=orange!15,fg=black}
\setbeamercolor{block title}{bg=orange,fg=white}
\setbeamercolor{local structure}{fg=orange}
\IfValueTF{#1}{%
\begin{block}{Question: #1}
}{%
\begin{block}{Question}
}
}{%
\end{block}
}

\ProvideDocumentEnvironment{exercise}{o}{%
\setbeamercolor{block body}{bg=yellow!10,fg=black}
\setbeamercolor{block title}{bg=yellow,fg=black}
\setbeamercolor{local structure}{fg=yellow}
\IfValueTF{#1}{%
\begin{block}{Exercise: #1}
}{%
\begin{block}{Exercise}
}
}{%
\end{block}
}


\begin{document}
\title{%
Mer om funktioner
}
\author{Daniel Bosk}
\institute{%
KTH EECS
}

\begin{frame}
\maketitle
\end{frame}

\mode<all>
\input{contents.tex}
\mode*

%\begin{frame}[allowframebreaks]
% \printbibliography
%\end{frame}
\end{document}