Browse files

changed task to exercise

  • Loading branch information...
1 parent 9a52e44 commit da10c339aec07802c14d93a8d346d258b2134702 Stephan Heidinger committed Dec 30, 2011
Showing with 58 additions and 47 deletions.
  1. +12 −12 README.markdown
  2. +26 −15 example/ukon-test.tex
  3. +20 −20 ukon-infie.sty
View
24 README.markdown
@@ -1,29 +1,29 @@
# General Info
-This package is made for students of Information Engineering and Computer
+This package is made for students of Information Engineering and Computer
Science at the University of Constance.
-It contains useful commands for styling the assignments and generating
+It contains useful commands for styling the assignments and generating
diagrams and graphs (not yet imported).
-University and Department are hardcoded into the package but of course
+University and Department are hardcoded into the package but of course
changeable.
-This package is still in an early alpha stage while our commands and functions
+This package is still in an early alpha stage while our commands and functions
are integrated. So as always use at your own risk.
-Feel free to use the Issue feature of Github to request features or give us
+Feel free to use the Issue feature of Github to request features or give us
feedback or send bug reports.
# List of Commands
* \Names
* \Lecture
* \Term
-* \task
-* \taskNumbering
-* \additionalTask
-* \additionalTaskNumbering
+* \exercise
+* \exerciseNumbering
+* \additionalExercise
+* \additionalExerciseNumbering
* \question
* \Venn
* \bigVenn
@@ -46,14 +46,14 @@ feedback or send bug reports.
# License
-This work is licensed under the Creative Commons
+This work is licensed under the Creative Commons
Attribution-NonCommercial-ShareAlike 3.0 Germany License.
The licence can be found at https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode
# Other
-Originally made by Jonas, Stephan, Morix and Manuel in the winter term of
+Originally made by Jonas, Stephan, Morix and Manuel in the winter term of
2010, refined throughout numerous assignments and night shifts.
-The layout was passed down to us from older fellow students, the origin
+The layout was passed down to us from older fellow students, the origin
remains uncertain.
View
41 example/ukon-test.tex
@@ -8,7 +8,7 @@
\begin{document}
\begin{ukon-infie}[Abgabedatum]{42}
- \task{Venn Diagramme}{10}{
+ \exercise{Venn Diagramme}{10}{
\emph{Explain the differences, advantages and disadvantages between the following algorithms:}
\begin{enumerate}
%(a)
@@ -37,21 +37,32 @@
}
\end{enumerate}
}
-
+
\newPage %this newPage must be used between exercises
-
- \additionalTask{Do some colorfull text and symbol stuff.}{5.5}{
- \red{red text} \\
- \blue{blue text} \\
- \green{green Schrift} \\
- \yellow{yelllow text} \\
- \darkRed{dark red text} \\
- \darkBlue{dark blue text} \\
- \darkGreen{dark green text} \\
- \darkYellow{dark yellow text} \\
- \correct \\
- \wrong
+
+ \additionalExercise{Do some colorfull text and symbol stuff.}{5.5}{
+ \red{red text} \\
+ \blue{blue text} \\
+ \green{green Schrift} \\
+ \yellow{yelllow text} \\
+ \darkRed{dark red text} \\
+ \darkBlue{dark blue text} \\
+ \darkGreen{dark green text} \\
+ \darkYellow{dark yellow text} \\
+ \correct \\
+ \wrong
+ }
+
+ \exerciseNumbering{Do something, where the questions are numbered}{2}{
+ \begin{enumerate}
+ \question{}{
+ \red{do Something}
+ }
+ \question{}{
+ \blue{do Something else}
+ }
+ \end{enumerate}
}
\end{ukon-infie}
-\end{document}
+\end{document}
View
40 ukon-infie.sty
@@ -480,7 +480,7 @@
\setcounter{anzPunkteGesamt}{0}
\newcounter{tPunkteG}
\setcounter{tPunkteG}{0}
-\newlength{\firstlen}
+\newlength{\firstlen}
\setlength{\firstlen}{\theanzPunkteGesamt.\thetPunkteG pt}
\ifdim\firstlen=\numberPointsTotal
\setboolean{boolvar}{false} %Zuweisung
@@ -489,7 +489,7 @@
{
\stepcounter{tPunkteG}
\ifthenelse{\thetPunkteG > 9}
-{
+{
\setcounter{tPunkteG}{0}
\stepcounter{anzPunkteGesamt}
}{}
@@ -511,7 +511,7 @@
{
\stepcounter{aPunkteG}
\ifthenelse{\theaPunkteG > 9}
-{
+{
\setcounter{aPunkteG}{0}
\stepcounter{anzAdditionalTotal}
}{}
@@ -529,15 +529,15 @@
{
\ifthenelse{\equal{\german}{1}}{\textbf{Punkte: (maximal \theanzPunkteGesamt\ifthenelse{\equal{\theanzAdditionalTotal+\theaPunkteG}{0+0}}{}{+\ifthenelse{\equal{\theaPunkteG}{0}}{\theanzAdditionalTotal}{\theanzAdditionalTotal.\theaPunkteG}} \ Punkte)}}{\textbf{Points: (maximal \theanzPunkteGesamt\ifthenelse{\equal{\theanzAdditionalTotal+\theaPunkteG}{0+0}}{}{+\ifthenelse{\equal{\theaPunkteG}{0}}{\theanzAdditionalTotal}{\theanzAdditionalTotal.\theaPunkteG}} \ Points)}}\\
}
- \begin{tikzpicture}
+ \begin{tikzpicture}
\tikzstyle{every node}=[font=\small]
\setcounter{tempPointTable}{1}
\forloop{ctPointTable}{0}{\thectPointTable < \thetotalNumber}
{
- \node[draw,rectangle,minimum height=0.6 cm, minimum width=2.2 cm] at (\themoveToPointTable *2.2,-\thelinePointTable*1.8){\ifthenelse{\equal{\german}{1}}{Aufgabe}{Task} \thetempPointTable};
+ \node[draw,rectangle,minimum height=0.6 cm, minimum width=2.2 cm] at (\themoveToPointTable *2.2,-\thelinePointTable*1.8){\ifthenelse{\equal{\german}{1}}{Aufgabe}{Exercise} \thetempPointTable};
\node[draw,rectangle,minimum height=1.0 cm, minimum width=2.2 cm] at( \themoveToPointTable *2.2,-\thelinePointTable*1.8 -0.9){};
-
+
\GetTokens{TokenOne}{TokenTwo}{\tempArray}
\let\tempArray\TokenTwo
@@ -548,18 +548,18 @@
\stepcounter{moveToPointTable}
\ifthenelse{\themoveToPointTable = 8}{\setcounter{moveToPointTable}{0}\stepcounter{linePointTable}}{}
}
-
+
\setcounter{ctPointTable}{\thetotalNumber}
-
+
\whiledo {\thectPointTable > 0}%
{
\setcounter{ctPointTable}{\thectPointTable - 8}
}
-
+
\ifthenelse{ \thectPointTable = 0}{\setcounter{ctPointTable}{0}}{\setcounter{ctPointTable}{1}}
\ifthenelse{\thetotalNumber = 3}
{
- \node[draw,rectangle,minimum height=0.6 cm, minimum width=2.2 cm] at (\themoveToPointTable * 2.2+\thectPointTable*0.08,-\thelinePointTable*1.8){\ifthenelse{\equal{\german}{1}}{\textbf{Gesamt}}{\textbf{Total}}};
+ \node[draw,rectangle,minimum height=0.6 cm, minimum width=2.2 cm] at (\themoveToPointTable * 2.2+\thectPointTable*0.08,-\thelinePointTable*1.8){\ifthenelse{\equal{\german}{1}}{\textbf{Gesamt}}{\textbf{Total}}};
\node[draw,rectangle,minimum height=1.0 cm, minimum width=2.2 cm] at ( \themoveToPointTable * 2.2+\thectPointTable*0.08,-\thelinePointTable*1.8-0.9) {};
\draw (\themoveToPointTable * 2.2+\thectPointTable*0.08-1.1,-\thelinePointTable*1.8-0.9-0.5) -- (\themoveToPointTable * 2.2+\thectPointTable*0.08+1.1,-\thelinePointTable*1.8-0.9+0.5);
\ifthenelse{ \thetPunkteG > 0}
@@ -570,8 +570,8 @@
\node at(\themoveToPointTable * 2.2+\thectPointTable*0.08+0.55,-\thelinePointTable*1.8-0.9-0.25) [] {\theanzPunkteGesamt\ifthenelse{\equal{\theanzAdditionalTotal+\theaPunkteG}{0+0}}{}{+\ifthenelse{\equal{\theaPunkteG}{0}}{\theanzAdditionalTotal}{\theanzAdditionalTotal.\theaPunkteG}}};
}
}
- {
- \node[draw,rectangle,minimum height=0.6 cm, minimum width=2.2 cm] at (\themoveToPointTable * 2.2+\thectPointTable*0.05,-\thelinePointTable*1.8){\ifthenelse{\equal{\german}{1}}{\textbf{Gesamt}}{\textbf{Total}}};
+ {
+ \node[draw,rectangle,minimum height=0.6 cm, minimum width=2.2 cm] at (\themoveToPointTable * 2.2+\thectPointTable*0.05,-\thelinePointTable*1.8){\ifthenelse{\equal{\german}{1}}{\textbf{Gesamt}}{\textbf{Total}}};
\node[draw,rectangle,minimum height=1.0 cm, minimum width=2.2 cm] at ( \themoveToPointTable * 2.2+\thectPointTable*0.05,-\thelinePointTable*1.8-0.9) {};
\draw (\themoveToPointTable * 2.2+\thectPointTable*0.05-1.1,-\thelinePointTable*1.8-0.9-0.5) -- (\themoveToPointTable * 2.2+\thectPointTable*0.05+1.1,-\thelinePointTable*1.8-0.9+0.5);
\ifthenelse{ \thetPunkteG > 0}
@@ -598,22 +598,22 @@
{\textbf{Aufgabe #1: #2}
\\
#5
-
+
\hfill \ifthenelse{\equal{#4}{\empty}}
{\points{[\qquad] von #3 Punkten}}
{\ifthenelse{\equal{#3}{\empty}}{\points{[\qquad] von + #4 Punkten}}{\points{[\qquad] von #3 + #4 Punkten}}}\\\\
}
- {\textbf{Task #1: #2}
+ {\textbf{Exercise #1: #2}
\\
#5
-
+
\hfill \ifthenelse{\equal{#4}{\empty}}
{\points{[\qquad] of #3 Points}}
{\ifthenelse{\equal{#3}{\empty}}{\points{[\qquad] of + #4 Points}}{\points{[\qquad] of #3 + #4 Points}}}\\\\
}
}
-\newcommand{\taskNumbering}[4][\empty]
+\newcommand{\exerciseNumbering}[4][\empty]
{
\g@addto@macro{\content}
{
@@ -639,7 +639,7 @@
\renewcommand{\labelenumii}{(\theenumii)} %zu faul zum nachschauen, aber wohl wichtig
}
-\newcommand{\task}[4][\empty]
+\newcommand{\exercise}[4][\empty]
{
\g@addto@macro{\content}
{
@@ -652,7 +652,7 @@
\g@addto@macro{\PointArray}{#3+#1,}}
}
-\newcommand{\additionalTask}[3]
+\newcommand{\additionalExercise}[3]
{
\g@addto@macro{\content}
{
@@ -664,7 +664,7 @@
\g@addto@macro{\PointArray}{+#2,}
}
-\newcommand{\additionalTaskNumbering}[3]
+\newcommand{\additionalExerciseNumbering}[3]
{
\g@addto@macro{\content}
{
@@ -682,7 +682,7 @@
{
\ifthenelse{\equal{#1}{\empty}}
{
-
+
\item{\textit{#2}}
\\
#3

0 comments on commit da10c33

Please sign in to comment.