Changeset 135 for docs

Legend:

Unmodified

Added

Removed

• docs/trunk/omega-test-slides/crg-group-beamer.sty

  r134	r135
  30	30	\pgfdeclareimage[height=1.0cm]{university-logo}{Kent_Comp_294_RGB}
  31	31	\logo{\pgfuseimage{university-logo}}
  32	(追記) (追記ここまで)
  33	(追記) %Must be used outside of a begin/end frame: (追記ここまで)
  34	(追記) \newcommand{\TurnLogoOn}[0]{\logo{\pgfuseimage{university-logo}}} (追記ここまで)
  35	(追記) \newcommand{\TurnLogoOff}[0]{\logo{}} (追記ここまで)
  32	36
  33	37	%Note: return isn't a Haskell keyword, but it's used enough and important

• docs/trunk/omega-test-slides/equality-nosol.gnu

  r110	r135
  1	load "(削除) (削除ここまで)gnuplot-settings.inc"
  1	load "(追記) 2d- (追記ここまで)gnuplot-settings.inc"
  2	2
  3	set title "(削除) On (削除ここまで)e Equation"
  3	set title "(追記) Unsolveabl (追記ここまで)e Equation"
  4	4
  5	set (削除) parametric (削除ここまで)
  5	set (追記) multiplot (追記ここまで)
  6	6
  7	set style fill transparent solid 0.5 noborder
  8	set palette defined (0 'red',1 'red')
  9	splot (30 + u - v)/3, u, v title "{/*1.5 x + y + 3z = 50}" with pm3d
  7	plot "points-1-3.inc" with points title "" pt 1 ps 2 lt -1
  8
  9	set key bottom right
  10
  11	plot x + 0.5 title "2y = 2x + 1" ls 3 with lines

• docs/trunk/omega-test-slides/omega-test.tex

  r133	r135
  2	2	\documentclass{beamer}
  3	3
  4	\newcommand{\graph}[1]{\includegraphics[width=70mm]{#1.png}}
  5
  6	\newcommand{\biggraph}[1]{\includegraphics[width=100mm]{#1.png}}
  7
  8	\newcommand{\fullframegraph}[2]{\frametitle{#1}\includegraphics[width=100mm]{#2}}
  4	\newcommand{\biggraph}[1]{\includegraphics[height=55mm]{#1.png}}
  5
  6	\newcommand{\fullframegraph}[2]{\frametitle{#1}\begin{center}\includegraphics[height=70mm]{#2}\end{center}}
  9	7
  10	8	\newcommand{\tick}[0]{\textcolor{KentGreen}{\ding{51}}}
  …	…
  128	126	\frametitle{The Omega Test}
  129	127	\begin{itemize}
  130	\item A linear integer equation solver(削除) (削除ここまで)
  128	\item A linear integer equation solver(追記) in $n$ dimensions (追記ここまで)
  131	129	\item Inputs:
  132	130	\begin{itemize}
  …	…
  136	134	\item Output is integer solution or ``unsolveable''
  137	135	\item All equations are joined by $\land$ (AND); $\lor$ (OR) effectively creates multiple equation-sets.
  136	(追記) \end{itemize} (追記ここまで)
  137	(追記) \end{frame} (追記ここまで)
  138	(追記) (追記ここまで)
  139	(追記) \begin{frame}[fragile] (追記ここまで)
  140	(追記) \frametitle{The Omega Test} (追記ここまで)
  141	(追記) \begin{itemize} (追記ここまで)
  142	(追記) \item General aim is to eliminate variables (reduce dimensions) (追記ここまで)
  143	(追記) \item Deal with equalities first (easiest) then inequalities (追記ここまで)
  138	144	\item Integer division is not reversible (and requires rational numbers), so is avoided.
  139	145	\end{itemize}
  …	…
  158	164	\section{Equalities}
  159	165
  166	(追記) % Section divider (追記ここまで)
  160	167	\begin{frame}
  161	168	\frametitle{Equalities}
  162	(削除) \begin{itemize} (削除ここまで)
  163	(削除) \item Each additional equality after the first can do one (and only one) of: (削除ここまで)
  164	(削除) \begin{itemize} (削除ここまで)
  165	(削除) \item Nothing (redundant equation) (削除ここまで)
  166	(削除) \item Disprove problem (inconsistent equation) (削除ここまで)
  167	(削除) \item Remove one variable (``useful'' equation) (削除ここまで)
  168	(削除) \end{itemize} (削除ここまで)
  169	(削除) \end{itemize} (削除ここまで)
  170	169	\end{frame}
  171	170
  172	171	%TODO mention integer grid, and how this relates to the equations
  173	172
  174	\begin{frame}[fragile]
  175	\frametitle{Equalities without integer solutions}
  176	\begin{itemize}
  177	\item The equation 2ドルx = 2y + 5$ has no integer solutions
  173	\TurnLogoOff
  174
  175	\begin{frame}[fragile]
  176	\fullframegraph{Unsolveable Equality}{equality-nosol}
  177	\end{frame}
  178
  179	\TurnLogoOn
  180
  181	\begin{frame}[fragile]
  182	\frametitle{Unsolveable Equality}
  183	\begin{itemize}
  184	\item The equation 2ドルx = 2y + 1$ has no integer solutions
  178	185	\begin{itemize}
  179	186	\item Rule: if the GCD of the variable coeffs does not divide the constant, there
  …	…
  183	190	\end{frame}
  184	191
  185	(削除) %Show a graph with one plane: (削除ここまで)
  186	(削除) (削除ここまで)
  187	(削除) \begin{frame}[fragile] (削除ここまで)
  188	(削除) \fullframegraph{First Equality}{equality-1} (削除ここまで)
  189	(削除) \end{frame} (削除ここまで)
  190	192
  191	193	%TODO show a graph with two planes in the same place (if that's even possible?)

Note: See TracChangeset for help on using the changeset viewer.