Resolving conflict.

Author: aubertc

source/projects/character_creator/description.md renamed to misc/evaluation_material/past/character_creator/description.md

@@ -240,7 +240,7 @@ PANDOC_DOC:= $(PANDOC_OPTIONS_ALT)
 # --reference-doc=$(DOCX_TEMPLATES)custom-reference.docx
 
 # Book build options
-PANDOC_BOOK_HTM:= $(PANDOC_HTM)
+PANDOC_BOOK_MD:= $(PANDOC_MD) --shift-heading-level-by=0 -M tags="book"
 PANDOC_BOOK_PDF:= $(PANDOC_PDF)
 PANDOC_BOOK_ODT:= $(PANDOC_ODT)
 PANDOC_BOOK_DOC:= $(PANDOC_DOC)
@@ -292,7 +292,6 @@ $(IMG_DIR)%.pdf:$(IMG_DIR)%.tex
 $(IMG_DIR)%.svg:$(IMG_DIR)%.pdf
 	pdf2svg $< $@
 
-
 $(IMG_DIR)%.png:$(IMG_DIR)%.pdf
 	pdftoppm $< $@ -png
 	mv $@-1.png $@
@@ -418,6 +417,9 @@ $(EXO_DIR)%.md: $(SOL_DIR)%.md
 # process.
 # Refer to sortFn.ts and web-order.ts
 # in the quartz branch for more info
+
+
+# This is work in progress and need to be updated.
 $(BUILD_DIR)web-order.ts: order
 	@mkdir -p $(dir $@)
 	@echo -n "// This file was generated automatically by calling make web-order.ts.\n// Refer to the Makefile to read indications on how to generate and edit it.\nexport const nameOrderMap: Record<string, number> = {\n" > $@
@@ -583,10 +585,7 @@ $(PROJECT_DIR)%.zip: $(PROJECT_DIR)%/*/Program.cs | $(PROJECT_DIR)/%/*/*.cs
 # -------------------------------
 
 $(BUILD_DIR)book.md:
-	pandoc $(SOURCE_BOOK) $(PANDOC_MD) -o $@
-
-#$(BUILD_DIR)book.html: $(BUILD_DIR)book.md
-#	pandoc $(SOURCE_BOOK) $(PANDOC_BOOK_HTM) -o $@
+	pandoc $(SOURCE_BOOK) $(PANDOC_BOOK_MD) -o $@
 
 $(BUILD_DIR)book.pdf: | $(BUILD_DIR)book.md
 	pandoc $(BUILD_DIR)book.md $(PANDOC_BOOK_PDF) -o $@

source/projects/character_creator/index.md renamed to misc/evaluation_material/past/character_creator/index.md

@@ -18,7 +18,7 @@ decimal meltParam
   }
 
   /* To convert from Kelvin to Celsius
-   * Cf. conversion rules at https://www.wikiwand.com/en/Kelvin
+   * Cf. conversion rules at https://en.wikipedia.org/wiki/Kelvin
    *                  from kelvins 	            to kelvins
    * Celsius 	        [°C] = [K] − 273.15 	    [K] = [°C] + 273.15
    * Fahrenheit 	    [°F] = [K] × ​9⁄5 − 459.67 	[K] = ([°F] + 459.67) × ​5⁄9

source/projects/character_creator/rubric.md renamed to misc/evaluation_material/past/character_creator/rubric.md

@@ -0,0 +1,95 @@
+using System;
+using System.IO;
+
+class Program
+{
+    static int factorial(int n)
+    {
+        if (n == 0)
+            return 1;
+        else
+            return checked(factorial(n - 1) * n);
+    }
+    
+    static void Main()
+    {
+        Console.WriteLine(int.MaxValue);
+        
+        int x = int.MaxValue;
+        int y = x + 1;
+        Console.WriteLine(y);
+        
+        try
+        {
+            y = checked(x + 1);
+        }
+        catch (System.OverflowException)
+        {
+            Console.WriteLine("An overflow exception was thrown.");
+        }
+        
+        int count0 = 0;
+        int n0 = 3;
+        try
+        {
+            while (true)
+            {
+                count0++;
+                n0 = checked(n0 +1 );
+            }
+        }
+        catch (System.OverflowException)
+        {
+            Console.WriteLine("An overflow exception was thrown after " + count0 + " iterations.");
+            // An overflow exception was thrown after 2147483645 iterations.
+        }
+        
+        int count1 = 0;
+        int n1 = 3;
+        try
+        {
+            while (true)
+            {
+                count1++;
+                n1 = checked(n1 * n1);
+            }
+        }
+        catch (System.OverflowException)
+        {
+            Console.WriteLine("An overflow exception was thrown after " + count1 + " iterations.");
+            // An overflow exception was thrown after 5 iterations.
+        }
+        
+        int count2 = 0;
+        int n2 = 3;
+        try
+        {
+            while (true)
+            {
+                count2++;
+                n2 = factorial(n2);
+            }
+        }
+        catch (System.OverflowException)
+        {
+            Console.WriteLine("An overflow exception was thrown after " + count2 + " iterations.");
+            // An overflow exception was thrown after 3 iterations.
+        }
+        
+        int count3 = 0;
+        int n3 = 100;
+        try
+        {
+            while (true)
+            {
+                count3++;
+                n3 = checked(n3 * (int)Math.Log(n3, 2));
+            }
+        }
+        catch (System.OverflowException)
+        {
+            Console.WriteLine("An overflow exception was thrown after " + count3 + " iterations.");
+            // An overflow exception was thrown after 7 iterations.
+        }
+    }
+}

source/projects/fighting_game/description.md renamed to misc/evaluation_material/past/fighting_game/description.md

@@ -20,7 +20,7 @@ The first source of support is the constant stream of feedback we receive from s
 
 This project has been monetarily supported by an [Affordable Learning Georgia](https://www.affordablelearninggeorgia.org/) [Transformation Grants](https://www.affordablelearninggeorgia.org/grants/overview/) ([Proposal 571](https://www.affordablelearninggeorgia.org/assets/documents/571-proposal.docx)) and a Continuous Improvement Grant (M260).
 
-[!["Affordable Learning Georgia"](./img/ALG_Logo_hires.png){ width=80% }](https://www.affordablelearninggeorgia.org/)
+[!["Affordable Learning Georgia"](./img/ALG_Logo_hires.png)](https://www.affordablelearninggeorgia.org/)
 
 This project also received the support of [Augusta University](https://www.augusta.edu/)'s [School of Computer and Cyber Sciences](https://www.augusta.edu/ccs/) and [Center for Instructional Innovation](https://www.augusta.edu/innovation/).
 
@@ -48,14 +48,14 @@ Those fonts have been specially selected for their legibility and [lower impact
 
 The source code and the website are graciously hosted and built by [github](https://github.com/).
 
-## Licence
+## License
 
 This work is under [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/).
 Concretely, this means that you are free to:
 
 - Save, print, copy and redistribute the entirety of the resources presented here,
 - Modify them as you see fit,
 
-as long as you give proper credit and keep the same licence.
+as long as you give proper credit and keep the same license .
 
-Please refer to [our licence file](https://github.com/princomp/princomp.github.io/blob/main/license.md) for the detail of this licence.
+Please refer to [our license  file](https://github.com/princomp/princomp.github.io/blob/main/license.md) for the details of this license .