Skip to content

Commit ce26166

Browse files
author
Andrew Cain
committed
Progress on chapter exercises for array and start for type declarations.
1 parent c47d369 commit ce26166

27 files changed

+682
-110
lines changed

‎Programming Arcana.tmproj

+121-88
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>currentDocument</key>
6-
<string>programming-arcana.tex</string>
6+
<string>topics/type-decl/exercises/type-exercises.tex</string>
77
<key>documents</key>
88
<array>
99
<dict>
@@ -20,7 +20,7 @@
2020
</dict>
2121
</array>
2222
<key>fileHierarchyDrawerWidth</key>
23-
<integer>249</integer>
23+
<integer>228</integer>
2424
<key>metaData</key>
2525
<dict>
2626
<key>preamble/commands.tex</key>
@@ -37,20 +37,6 @@
3737
<key>firstVisibleLine</key>
3838
<integer>0</integer>
3939
</dict>
40-
<key>programming-arcana.tex</key>
41-
<dict>
42-
<key>caret</key>
43-
<dict>
44-
<key>column</key>
45-
<integer>2</integer>
46-
<key>line</key>
47-
<integer>19</integer>
48-
</dict>
49-
<key>firstVisibleColumn</key>
50-
<integer>0</integer>
51-
<key>firstVisibleLine</key>
52-
<integer>0</integer>
53-
</dict>
5440
<key>syntax-out/c/storing-using-data/assignment-statement.tex</key>
5541
<dict>
5642
<key>caret</key>
@@ -426,14 +412,14 @@
426412
<key>caret</key>
427413
<dict>
428414
<key>column</key>
429-
<integer>453</integer>
415+
<integer>187</integer>
430416
<key>line</key>
431-
<integer>16</integer>
417+
<integer>7</integer>
432418
</dict>
433419
<key>firstVisibleColumn</key>
434420
<integer>0</integer>
435421
<key>firstVisibleLine</key>
436-
<integer>15</integer>
422+
<integer>0</integer>
437423
</dict>
438424
<key>topics/arrays/c/c-stats-calc.tex</key>
439425
<dict>
@@ -493,20 +479,6 @@
493479
<integer>37</integer>
494480
</dict>
495481
</dict>
496-
<key>topics/control-flow/control-flow.tex</key>
497-
<dict>
498-
<key>caret</key>
499-
<dict>
500-
<key>column</key>
501-
<integer>22</integer>
502-
<key>line</key>
503-
<integer>151</integer>
504-
</dict>
505-
<key>firstVisibleColumn</key>
506-
<integer>0</integer>
507-
<key>firstVisibleLine</key>
508-
<integer>116</integer>
509-
</dict>
510482
<key>topics/looping/looping.tex</key>
511483
<dict>
512484
<key>caret</key>
@@ -537,20 +509,6 @@
537509
<integer>30</integer>
538510
</dict>
539511
</dict>
540-
<key>topics/procedure-decl/examples/MorseCalling.pas</key>
541-
<dict>
542-
<key>caret</key>
543-
<dict>
544-
<key>column</key>
545-
<integer>11</integer>
546-
<key>line</key>
547-
<integer>27</integer>
548-
</dict>
549-
<key>firstVisibleColumn</key>
550-
<integer>0</integer>
551-
<key>firstVisibleLine</key>
552-
<integer>0</integer>
553-
</dict>
554512
<key>topics/procedure-decl/examples/MorseCalling.txt</key>
555513
<dict>
556514
<key>caret</key>
@@ -579,35 +537,19 @@
579537
<key>firstVisibleLine</key>
580538
<integer>0</integer>
581539
</dict>
582-
<key>topics/procedure-decl/examples/morse-calling.c</key>
540+
<key>topics/procedure-decl/exercises/procedure-decl-exercises.tex</key>
583541
<dict>
584542
<key>caret</key>
585543
<dict>
586544
<key>column</key>
587-
<integer>1</integer>
545+
<integer>13</integer>
588546
<key>line</key>
589547
<integer>54</integer>
590548
</dict>
591-
<key>columnSelection</key>
592-
<false/>
593549
<key>firstVisibleColumn</key>
594550
<integer>0</integer>
595551
<key>firstVisibleLine</key>
596-
<integer>0</integer>
597-
<key>selectFrom</key>
598-
<dict>
599-
<key>column</key>
600-
<integer>0</integer>
601-
<key>line</key>
602-
<integer>42</integer>
603-
</dict>
604-
<key>selectTo</key>
605-
<dict>
606-
<key>column</key>
607-
<integer>1</integer>
608-
<key>line</key>
609-
<integer>54</integer>
610-
</dict>
552+
<integer>35</integer>
611553
</dict>
612554
<key>topics/program-creation/c/identifier.tex</key>
613555
<dict>
@@ -749,6 +691,20 @@
749691
<key>firstVisibleLine</key>
750692
<integer>0</integer>
751693
</dict>
694+
<key>topics/program-creation/exercises/exercises.tex</key>
695+
<dict>
696+
<key>caret</key>
697+
<dict>
698+
<key>column</key>
699+
<integer>20</integer>
700+
<key>line</key>
701+
<integer>39</integer>
702+
</dict>
703+
<key>firstVisibleColumn</key>
704+
<integer>0</integer>
705+
<key>firstVisibleLine</key>
706+
<integer>0</integer>
707+
</dict>
752708
<key>topics/storing-using-data/c/c-function-call.tex</key>
753709
<dict>
754710
<key>caret</key>
@@ -921,6 +877,66 @@
921877
<integer>4</integer>
922878
</dict>
923879
</dict>
880+
<key>topics/storing-using-data/exercises/data-exercises.tex</key>
881+
<dict>
882+
<key>caret</key>
883+
<dict>
884+
<key>column</key>
885+
<integer>0</integer>
886+
<key>line</key>
887+
<integer>114</integer>
888+
</dict>
889+
<key>columnSelection</key>
890+
<false/>
891+
<key>firstVisibleColumn</key>
892+
<integer>451</integer>
893+
<key>firstVisibleLine</key>
894+
<integer>92</integer>
895+
<key>selectFrom</key>
896+
<dict>
897+
<key>column</key>
898+
<integer>0</integer>
899+
<key>line</key>
900+
<integer>111</integer>
901+
</dict>
902+
<key>selectTo</key>
903+
<dict>
904+
<key>column</key>
905+
<integer>0</integer>
906+
<key>line</key>
907+
<integer>114</integer>
908+
</dict>
909+
</dict>
910+
<key>topics/storing-using-data/storing-using-data.tex</key>
911+
<dict>
912+
<key>caret</key>
913+
<dict>
914+
<key>column</key>
915+
<integer>73</integer>
916+
<key>line</key>
917+
<integer>16</integer>
918+
</dict>
919+
<key>columnSelection</key>
920+
<false/>
921+
<key>firstVisibleColumn</key>
922+
<integer>0</integer>
923+
<key>firstVisibleLine</key>
924+
<integer>0</integer>
925+
<key>selectFrom</key>
926+
<dict>
927+
<key>column</key>
928+
<integer>0</integer>
929+
<key>line</key>
930+
<integer>16</integer>
931+
</dict>
932+
<key>selectTo</key>
933+
<dict>
934+
<key>column</key>
935+
<integer>73</integer>
936+
<key>line</key>
937+
<integer>16</integer>
938+
</dict>
939+
</dict>
924940
<key>topics/type-decl/application/using-custom-types.tex</key>
925941
<dict>
926942
<key>caret</key>
@@ -981,10 +997,42 @@
981997
<integer>2</integer>
982998
</dict>
983999
</dict>
1000+
<key>topics/type-decl/exercises/type-exercises.tex</key>
1001+
<dict>
1002+
<key>caret</key>
1003+
<dict>
1004+
<key>column</key>
1005+
<integer>181</integer>
1006+
<key>line</key>
1007+
<integer>44</integer>
1008+
</dict>
1009+
<key>firstVisibleColumn</key>
1010+
<integer>55</integer>
1011+
<key>firstVisibleLine</key>
1012+
<integer>15</integer>
1013+
</dict>
1014+
<key>topics/type-decl/type-decl.tex</key>
1015+
<dict>
1016+
<key>caret</key>
1017+
<dict>
1018+
<key>column</key>
1019+
<integer>16</integer>
1020+
<key>line</key>
1021+
<integer>96</integer>
1022+
</dict>
1023+
<key>firstVisibleColumn</key>
1024+
<integer>0</integer>
1025+
<key>firstVisibleLine</key>
1026+
<integer>96</integer>
1027+
</dict>
9841028
</dict>
9851029
<key>openDocuments</key>
9861030
<array>
987-
<string>programming-arcana.tex</string>
1031+
<string>topics/type-decl/type-decl.tex</string>
1032+
<string>topics/type-decl/exercises/type-exercises.tex</string>
1033+
<string>topics/storing-using-data/exercises/data-exercises.tex</string>
1034+
<string>topics/storing-using-data/storing-using-data.tex</string>
1035+
<string>topics/arrays/arrays.tex</string>
9881036
</array>
9891037
<key>shellVariables</key>
9901038
<array>
@@ -1009,7 +1057,7 @@
10091057
<true/>
10101058
<key>subItems</key>
10111059
<dict>
1012-
<key>code</key>
1060+
<key>preamble</key>
10131061
<dict>
10141062
<key>isExpanded</key>
10151063
<true/>
@@ -1022,22 +1070,14 @@
10221070
<true/>
10231071
<key>subItems</key>
10241072
<dict>
1025-
<key>procedure-decl</key>
1073+
<key>arrays</key>
10261074
<dict>
10271075
<key>isExpanded</key>
10281076
<true/>
10291077
<key>subItems</key>
1030-
<dict>
1031-
<key>exercises</key>
1032-
<dict>
1033-
<key>isExpanded</key>
1034-
<true/>
1035-
<key>subItems</key>
1036-
<dict/>
1037-
</dict>
1038-
</dict>
1078+
<dict/>
10391079
</dict>
1040-
<key>program-creation</key>
1080+
<key>storing-using-data</key>
10411081
<dict>
10421082
<key>isExpanded</key>
10431083
<true/>
@@ -1052,19 +1092,12 @@
10521092
</dict>
10531093
</dict>
10541094
</dict>
1055-
<key>storing-using-data</key>
1095+
<key>type-decl</key>
10561096
<dict>
10571097
<key>isExpanded</key>
10581098
<true/>
10591099
<key>subItems</key>
10601100
<dict>
1061-
<key>examples</key>
1062-
<dict>
1063-
<key>isExpanded</key>
1064-
<true/>
1065-
<key>subItems</key>
1066-
<dict/>
1067-
</dict>
10681101
<key>exercises</key>
10691102
<dict>
10701103
<key>isExpanded</key>
@@ -1080,6 +1113,6 @@
10801113
</dict>
10811114
</dict>
10821115
<key>windowFrame</key>
1083-
<string>{{0, 4}, {2560, 1414}}</string>
1116+
<string>{{689, 4}, {720, 874}}</string>
10841117
</dict>
10851118
</plist>

‎T.png

318 KB
Loading

‎code/c/array/simple-stats.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ void populate_array(double data[], int size)
7575
}
7676
}
7777

78-
// Implements a simple guessing game. The program generates
79-
// a random number, and the player tries to guess it.
78+
// Implements a statistics calculator. The program reads in values entered by the user
79+
// and then calculates the sum, mean, variance, and max
8080
int main()
8181
{
8282
double data[DATA_SIZE];

‎preamble/preamble.tex

+9
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,15 @@
246246

247247
\input{preamble/commands}
248248

249+
\setcounter{totalnumber}{50}
250+
\setcounter{topnumber}{50}
251+
\setcounter{bottomnumber}{50}
252+
253+
\renewcommand\floatpagefraction{.9}
254+
\renewcommand\topfraction{.9}
255+
\renewcommand\bottomfraction{.9}
256+
\renewcommand\textfraction{.1}
257+
249258
% ============
250259
% = Metadata =
251260
% ============

‎programming-arcana.tex

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
% \includeonly{topics/preface/preface}
77
% \includeonly{topics/programs-and-compilers/compilers}
8-
%\includeonly{topics/program-creation/program-creation}
8+
% \includeonly{topics/program-creation/program-creation}
99
% \includeonly{topics/procedure-decl/procedure-decl}
1010
% \includeonly{topics/storing-using-data/storing-using-data}
1111
% \includeonly{topics/control-flow/control-flow}
12-
\includeonly{topics/arrays/arrays}
13-
% \includeonly{topics/type-decl/type-decl}
12+
% \includeonly{topics/arrays/arrays}
13+
\includeonly{topics/type-decl/type-decl}
1414
% \includeonly{topics/dynamic-memory/dynamic-memory}
1515

1616
\begin{document}
@@ -32,7 +32,8 @@
3232
\include{topics/arrays/arrays}
3333
\include{topics/type-decl/type-decl}
3434
\include{topics/dynamic-memory/dynamic-memory}
35-
% \include{topics/library-creation/library-creation}
35+
% \include{topics/persisting-data/persisting-data}
36+
% \include{topics/modular-programming/modular-programming}
3637

3738
\appendix
3839
\include{appendix/starting-swingame}

‎resources/images/00000004

154 KB
Binary file not shown.

0 commit comments

Comments
 (0)