Skip to content

Commit

Permalink
Updated chapter files
Browse files Browse the repository at this point in the history
Now individual chapters will compile separately, without messing up the
ability of the whole book to use the chapter files as chapters.
  • Loading branch information
oscarlevin committed Aug 20, 2014
1 parent 080fa5e commit 4d3045a
Show file tree
Hide file tree
Showing 23 changed files with 122 additions and 48 deletions.
4 changes: 0 additions & 4 deletions chapter1.tex

This file was deleted.

Binary file added chapters/AdvancedCounting.pdf
Binary file not shown.
9 changes: 4 additions & 5 deletions chapters/AdvancedCounting.tex
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
\documentclass[12pt]{article}

\usepackage{../discrete}
\usepackage{discrete}

\usetikzlibrary{shapes}
\def\thetitle{Advanced Counting} % will be put in the center header on the first page only.
\def\lefthead{Math 228 Notes} % will be put in the left header
\def\righthead{\thetitle} % will be put in the right header

\usepackage{pgf}

\heading{Math 228}{}{Advanced Counting Notes}



Expand Down
Binary file added chapters/CombinatorialProofs.pdf
Binary file not shown.
8 changes: 4 additions & 4 deletions chapters/CombinatorialProofs.tex
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
\documentclass[12pt]{article}

\usepackage{../discrete}
\usepackage{discrete}

\usetikzlibrary{shapes}
\def\thetitle{Combinatorial Proofs} % will be put in the center header on the first page only.
\def\lefthead{Math 228 Notes} % will be put in the left header
\def\righthead{\thetitle} % will be put in the right header

\usepackage{pgf}

\heading{Math 228}{}{Combinatorial Proofs Notes}



Expand Down
Binary file added chapters/Counting.pdf
Binary file not shown.
11 changes: 5 additions & 6 deletions chapters/Counting.tex
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
\documentclass[12pt]{article}

\usepackage{../discrete}
\usetikzlibrary{shapes,snakes}
\usepackage{pgf}

\heading{Math 228}{}{Counting Notes}
\usepackage{discrete}

\def\thetitle{Introduction to Counting} % will be put in the center header on the first page only.
\def\lefthead{Math 228 Notes} % will be put in the left header
\def\righthead{Counting} % will be put in the right header


\begin{document}
Expand Down Expand Up @@ -119,7 +118,7 @@ \section{Counting with sets}
From the example above, we see that in order to investigate the multiplicative principle carefully, we need to consider ordered pairs. We should define this carefully.

\begin{definition}
Given sets $A$ and $B$, we can form the {\em set} $A \times B = \{(x,y) \st x \in A \and y \in B\}$ to be the set of all ordered pairs $(x,y)$ where $x$ is an element of $A$ and $y$ is an element of $B$. We call $A \times B$ the {\em Cartesian product} of $A$ and $B$.
Given sets $A$ and $B$, we can form the {\em set} $A \times B = \{(x,y) \st x \in A \wedge y \in B\}$ to be the set of all ordered pairs $(x,y)$ where $x$ is an element of $A$ and $y$ is an element of $B$. We call $A \times B$ the {\em Cartesian product} of $A$ and $B$.
\end{definition}

The question is, what is $|A \times B|$ - the cardinality of the Cartesian product? To figure this out, let's write out $A \times B$.
Expand Down
Binary file added chapters/GeneratingFunctions.pdf
Binary file not shown.
8 changes: 4 additions & 4 deletions chapters/GeneratingFunctions.tex
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
\documentclass[12pt]{article}

\usepackage{../discrete}

\heading{Math 228}{}{Generating Functions Notes}

\usepackage{discrete}

\def\thetitle{Generating Functions} % will be put in the center header on the first page only.
\def\lefthead{Math 228 Notes} % will be put in the left header
\def\righthead{\thetitle} % will be put in the right header

\begin{document}
\section{Generating Functions}
Expand Down
Binary file added chapters/GraphTheory.pdf
Binary file not shown.
10 changes: 4 additions & 6 deletions chapters/GraphTheory.tex
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
\documentclass[12pt]{article}

\usepackage{../discrete}
\usepackage{discrete}

\usetikzlibrary{shapes}

\usepackage{pgf}

\heading{Math 228}{}{Graph Theory Notes}
\def\thetitle{Introduction to Graph Theory} % will be put in the center header on the first page only.
\def\lefthead{Math 228 Notes} % will be put in the left header
\def\righthead{\thetitle} % will be put in the right header



Expand Down
Binary file added chapters/Induction.pdf
Binary file not shown.
7 changes: 4 additions & 3 deletions chapters/Induction.tex
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
\documentclass[12pt]{article}

\usepackage{../discrete}

\heading{Math 228}{}{Induction Notes}
\usepackage{discrete}

\def\thetitle{The Principle of Mathematical Induction} % will be put in the center header on the first page only.
\def\lefthead{Math 228 Notes} % will be put in the left header
\def\righthead{Induction} % will be put in the right header


\begin{document}
Expand Down
Binary file added chapters/Logic.pdf
Binary file not shown.
7 changes: 4 additions & 3 deletions chapters/Logic.tex
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
\documentclass[12pt]{article}

\usepackage{../discrete}

\heading{Math 228}{}{Logic Notes}
\usepackage{discrete}

\def\thetitle{Mathematical Logic} % will be put in the center header on the first page only.
\def\lefthead{Math 228 Notes} % will be put in the left header
\def\righthead{Logic} % will be put in the right header


\begin{document}
Expand Down
Binary file added chapters/NumberTheory.pdf
Binary file not shown.
8 changes: 4 additions & 4 deletions chapters/NumberTheory.tex
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
\documentclass[12pt]{article}

\usepackage{../discrete}

\heading{Math 228}{}{Number Theory Notes}

\usepackage{discrete}

\def\thetitle{Introduction to Number Theory} % will be put in the center header on the first page only.
\def\lefthead{Math 228 Notes} % will be put in the left header
\def\righthead{Number Theory} % will be put in the right header

\begin{document}
%\section*{Introduction to Number Theory}\setcounter{section}{1}
Expand Down
Binary file added chapters/Quantifiers_Sets.pdf
Binary file not shown.
10 changes: 5 additions & 5 deletions chapters/Quantifiers_Sets.tex
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
\documentclass[12pt]{article}

\usepackage{../discrete}

\heading{Math 228}{}{Logic 2: Quantifiers and Sets Notes }

\usepackage{discrete}

\def\thetitle{Quantifiers and Set Theory} % will be put in the center header on the first page only.
\def\lefthead{Math 228 Notes} % will be put in the left header
\def\righthead{Quantifiers and Sets} % will be put in the right header

\begin{document}
\section*{Quantifiers and Sets}
%\section*{Quantifiers and Sets}

So far we have seen how statements can be combined with logical symbols. This is helpful when trying to understand a complicated mathematical statement - you can determine under which conditions the complicated statement is true. Additionally, we have been able to analyze the logical form of arguments to decide which arguments are valid and which are not. However, the types of statements we have been able to make so far has be sorely limited. For example, consider a classic argument:

Expand Down
Binary file added chapters/Sequences.pdf
Binary file not shown.
8 changes: 4 additions & 4 deletions chapters/Sequences.tex
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
\documentclass[12pt]{article}

\usepackage{../discrete}

\heading{Math 228}{}{Sequences Notes}

\usepackage{discrete}

\def\thetitle{Sequences} % will be put in the center header on the first page only.
\def\lefthead{Math 228 Notes} % will be put in the left header
\def\righthead{\thetitle} % will be put in the right header

\begin{document}
As the legend goes, there is a monastery in Hanoi with a great hall containing 3 tall pillars. Resting on the first pillar are 64 giant disks (or washers) - all different sizes, stacked from largest to smallest. The monks are charged with the following task: they must move the entire stack of disks to the third pillar. However, due to the size of the disks, the monks cannot move more than one at a time. Each disk must be placed on one of the pillars before the next disk is moved. And because the disks are so heavy and fragile, the monks may never place a larger disk on top of a smaller disk.
Expand Down
80 changes: 80 additions & 0 deletions chapters/discrete.sty
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
%%% This is discrete.sty
%%% It is an attempt at designing a package to be used in my discrete course notes. It will load amsmath, amsthm, etc and all the definitions I like.

\ProvidesPackage{discrete}

\usepackage{amssymb, amsmath, amsthm, mathrsfs, multicol, graphicx}
\usepackage[top=1in, bottom=1in, left=1in, right=1in]{geometry}
\usepackage{changepage} % for adding extra indents in environments
\usepackage{fancyhdr}
\usepackage{tikz}
\usepackage{framed}
\usepackage{textcomp}
\usepackage{booktabs}
\usepackage{ifthen}
\usepackage{everypage}

\pagestyle{fancy}


\AddEverypageHook{%
\ifthenelse{\value{page}=1}%
{\renewcommand{\headrulewidth}{0.0pt}}%
{\renewcommand{\headrulewidth}{0.4pt}}%
}
%\makeatletter\let\thetitle\@title\makeatother
%headers and footers:
\renewcommand{\headrulewidth}{0.1pt}
%\renewcommand{\chaptermark}[1]{\markboth{#1}{}}
\renewcommand{\sectionmark}[1]{\markright{#1}{}}
\lhead{\ifthenelse{\value{page}=1}{}{\footnotesize \lefthead}}
\chead{\ifthenelse{\value{page}=1}{\textbf{\Large \thetitle}}{}}
\rhead{\ifthenelse{\value{page}=1}{}{\footnotesize \righthead}}
\newcommand{\heading}[3]{\clearpage{\lhead{\footnotesize #1} \chead{\bf #2} \rhead{\footnotesize #3}}}
%\chead{\title}
%\newcommand{\cleanpage}{\cfoot{}}



%new list environments
\newcounter{qcounter}
\newcounter{pcounter}
\newenvironment{questions}{\begin{list}{\arabic{qcounter}.~}{\usecounter{qcounter}}}{\end{list}}
\newcommand{\question}[1]{\item #1}
\newenvironment{parts}{\begin{list}{(\alph{pcounter})~}{\usecounter{pcounter}}}{\end{list}}
\renewcommand{\part}[1]{\item #1}


\theoremstyle{plain}
\newtheorem*{theorem}{Theorem}
\newtheorem{problem}{Problem}
\newtheorem*{conjecture}{Conjecture}
%\newtheorem{answer}{Answer}

\theoremstyle{definition}
\newtheorem{definition}{Definition}
%\newtheorem{example}{Example}
\newtheorem{probfact}{Probability Fact}

\theoremstyle{remark}
\newtheorem*{remark}{Remark}
%\newtheorem*{solution}{Solution}

%Create indented ``example'' environment:
\newenvironment{example}{\vskip 2em \begin{adjustwidth}{3em}{3em}{\bf Example}: }{\end{adjustwidth}\vskip 2em}
%Create ``solution'' environment:
\newenvironment{solution}{\vskip 1ex \noindent {\em Solution}:}{}
%Create ``defbox'' environment to highlight important definitions
\newenvironment{defbox}[1]{\vskip 1em \begin{framed}\noindent{\bf #1\\}}{\end{framed}}

\newcommand{\ex}{\noindent{\bf Ex: }}


\renewcommand{\qedsymbol}{\small QED}


\input{../macros-discrete}

\endinput

%%% End of File.
Binary file added chapters/images/7bridgescolor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 4d3045a

Please sign in to comment.