Merge remote-tracking branch 'origin/master' into mr/295-tool-to_create_labs_folder

Author: frank-at-adacore

courses/ada_essentials/010_overview/03-setup.rst

@@ -153,9 +153,9 @@ Modular Type Semantics
    - **Bit shifts**
    - Values as **bit-sequences**
 
---------------------------
-Predefined Modular Types
---------------------------
+--------------------------------
+Predefined Sized Numeric Types
+--------------------------------
 
 * In :ada:`Interfaces` package
 

courses/ada_essentials/030_scalar_types/02-discrete_numeric_types_with_mod.rst

@@ -8,29 +8,22 @@ Statements Lab
 
 * Requirements
 
-   - Create a simple algorithm to count number of hours worked in a week
+   - Create a simple program to build a time tracking sheet for the week
+   
+      + For every day of the week, print a line indicating the time of day (in hours)
 
-      + Use `Ada.Text_IO.Get_Line` to ask user for hours worked on each day
-      + Any hours over 8 gets counted as 1.5 times number of hours (e.g. 10 hours worked will get counted as 11 hours towards total)
-      + Saturday hours get counted at 1.5 times number of hours
-      + Sunday hours get counted at 2 times number of hours
+   - Conditions for printing time
 
-   - Print total number of hours "worked"
+      + Only print times for "normal" working hours
+      + No working on Sunday, so no times printed
+      + Saturday is a half-day, so only print every other time slot
 
 * Hints
 
-   - Use `for` loop to iterate over days of week
-   - Use `if` statement to determine overtime hours
-   - Use `case` statement to determine weekend bonus
-
------------------------------
-Statements Lab Extra Credit
------------------------------
-
-* Use an inner loop when getting hours worked to check validity
-
-   - Less than 0 should exit outer loop
-   - More than 24 should not be allowed
+   - Use a :ada:`for` loop to iterate over days of week and hours
+   - Use a :ada:`case` statement to determine how start and end time
+   - Use an :ada:`if` statement to determine if you are printing a time
+   - For simplicity, feel free to use a 24-hour clock
 
 -------------------------
 Statements Lab Solution

courses/ada_essentials/040_statements/88-statements.lab.rst

@@ -2,6 +2,7 @@ with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    type Days_Of_Week_T is
      (Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday);
+<<<<<<< HEAD
    type Hours_Worked is digits 6;
 
    Total_Worked : Hours_Worked := 0.0;
@@ -36,4 +37,36 @@ begin
    end loop Day_Loop;
 
    Put_Line (Hours_Worked'Image (Total_Worked));
+=======
+   type Hours is mod 24;
+   Start     : Hours;
+   Finish    : Hours;
+   Big_Block : Boolean;
+begin
+   Day_Loop :
+   for Day in Days_Of_Week_T loop
+      case Day is
+         when Sunday =>
+            Start  := 1;
+            Finish := 0;
+         when Saturday =>
+            Start     := 9;
+            Finish    := 13;
+            Big_Block := True;
+         when Monday .. Friday =>
+            Start     := 9;
+            Finish    := 17;
+            Big_Block := False;
+      end case;
+      Put_Line (Days_Of_Week_T'Image (Day));
+      Put_Line ("======");
+      for Hour in Start .. Finish loop
+         if Big_Block and then (2 * (Hour / 2) = Hour) then
+            New_Line;
+         else
+            Put_Line ("   " & Hours'Image (Hour) & "00");
+         end if;
+      end loop;
+   end loop Day_Loop;
+>>>>>>> origin/master
 end Main;

courses/ada_essentials/040_statements/lab/statements/ada95/main.adb

@@ -2,6 +2,7 @@ with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    type Days_Of_Week_T is
      (Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday);
+<<<<<<< HEAD
    type Hours_Worked is digits 6;
 
    Total_Worked : Hours_Worked := 0.0;
@@ -33,4 +34,36 @@ begin
    end loop Day_Loop;
 
    Put_Line (Total_Worked'Image);
+=======
+   type Hours is mod 24;
+   Start     : Hours;
+   Finish    : Hours;
+   Big_Block : Boolean;
+begin
+   Day_Loop :
+   for Day in Days_Of_Week_T loop
+      case Day is
+         when Sunday =>
+            Start  := 1;
+            Finish := 0;
+         when Saturday =>
+            Start     := 9;
+            Finish    := 13;
+            Big_Block := True;
+         when Monday .. Friday =>
+            Start     := 9;
+            Finish    := 17;
+            Big_Block := False;
+      end case;
+      Put_Line (Day'Image);
+      Put_Line ("======");
+      for Hour in Start .. Finish loop
+         if Big_Block and then (2 * (Hour / 2) = Hour) then
+            New_Line;
+         else
+            Put_Line ("   " & Hour'Image & "00");
+         end if;
+      end loop;
+   end loop Day_Loop;
+>>>>>>> origin/master
 end Main;

courses/ada_essentials/040_statements/lab/statements/answer/main.adb

@@ -2,30 +2,22 @@ with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    type Days_Of_Week_T is
      (Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday);
-   type Hours_Worked is digits 6;
-
-   Total_Worked : Hours_Worked := 0.0;
-   Hours_Today  : Hours_Worked;
-   Overtime     : Hours_Worked;
+   type Hours is mod 24;
+   Start  : Hours;
+   Finish : Hours;
 begin
-   -- For each day in the Days_Of_Week_T loop
-      -- Print prompt indicating which day we're asking for
-      -- Loop "forever"
-         Hours_Today := Hours_Worked'Value (Get_Line);
-         -- exit the main loop if hours worked < 0
-         if Hours_Today > 24.0 then
-            Put_Line ("I don't believe you");
-         else
-            -- exit the input loop if a reasonable number is reached
-            null;
-         end if;
-      -- if hours worked > 8 then
-         Overtime    := Hours_Today - 8.0;
-         Hours_Today := Hours_Today + 1.5 * Overtime;
-      -- Calculate actual hours paid for based on day of the week
-         -- Monday - Friday, just add hours worked
-         -- Saturday - hours worked * 1.5
-         -- Sunday - hours worked * 2
+   -- Loop over Days_Of_Week_T
+
+   --  Use a "case" statement to determine when the workday
+   --  starts and ends based on the day of the week
+   Start  := 0;
+   Finish := 23;
+
+   --  Print a header indicating what day of the week it is
+   Put_Line ("Day of Week");        --  (example)
+   --  For Saturday, print a line for every other hour (e.g. 3, 5, 7)
+   Put_Line (Hours'Image (Start));  --  (example)
+   --  For other days, print a line for every hour
+   Put_Line (Hours'Image (Finish)); --  (example)
 
-   Put_Line (Hours_Worked'Image (Total_Worked));
 end Main;