Sixth Change

5 files changed, 68 insertions, 64 deletions

diff --git a/CST116-Ch6-Debugging/CST116-Ch6-Debugging.cpp b/CST116-Ch6-Debugging/CST116-Ch6-Debugging-Chambers.cpp
index a4cede0..a1b960c 100644
--- a/CST116-Ch6-Debugging/CST116-Ch6-Debugging.cpp
+++ b/CST116-Ch6-Debugging/CST116-Ch6-Debugging-Chambers.cpp
@@ -1,60 +1,60 @@
-/********************************************************************

-* File: CST116-Ch6-Debugging.cpp

-*

-* General Instructions: Complete each step before proceeding to the

-* next.

-*

-* Debugging Exercise 1

-*

-* 1) On the lines indicated in the code below, insert a breakpoint.

-* 2) Run to the breakpoint.

-* 3) Put watches on both Fahrenheit and Celsius.

-* 4) When asked for a temperature, enter 212.

-* 5) Verify that the value you entered is stored correctly.

-* 6) Step over the conversion calculation. What is the value

-*    in Celsius? Is that the correct value? No.

-* 7) Remember your order of precedence. Put parentheses around

-*    Fahrenheit - 32. This needs to be done before the multiplication.

-* 8) Stop debugging and recompile.

-*

-* Debugging Exercise 2

-*

-* 1) Run to Breakpoint 1.

-* 2) When asked for a temperature, enter 212.

-* 3) Verify that the value you entered is stored correctly.

-* 4) Step over the conversion calculation. What is the value

-*    in Celsius? Is that the correct value? No.

-* 5) Look at the division. This is integer division. Therefore,

-*    5 / 9 = 0. This is not the result we are looking for.

-* 6) Modify the calculation so that it does floating point division.

-*    There are three different ways we have discussed:

-*           a) use the F suffix on the literals

-*           b) type cast the literals

-*           c) replace the 5 with 5.0 and the 9 with 9.0

-* 7) Stop debugging, recompile and run to verify that it now works

-*    correctly.

-********************************************************************/

-

-#include <iostream>

-#include <iomanip>

-using std::cout;

-using std::cin;

-using std::endl;

-

-int main()

-{

-    float fahrenheit = 0;

-    float celcius = 0;

-

-    cout << "Enter temperature in Fahrenheit: ";

-    cin >> fahrenheit;

-

-    // Breakpoint 1

-    // Put a breakpoint on the following line

-    celcius = 5.0 / 9.0 * (fahrenheit - 32);

-

-    cout << fahrenheit << " degrees F = "

-        << celcius << " degrees C" << endl;

-

-    return 0;

-}

+/********************************************************************
+* File: CST116-Ch6-Debugging.cpp
+*
+* General Instructions: Complete each step before proceeding to the
+* next.
+*
+* Debugging Exercise 1
+*
+* 1) On the lines indicated in the code below, insert a breakpoint.
+* 2) Run to the breakpoint.
+* 3) Put watches on both Fahrenheit and Celsius.
+* 4) When asked for a temperature, enter 212.
+* 5) Verify that the value you entered is stored correctly.
+* 6) Step over the conversion calculation. What is the value
+*    in Celsius? Is that the correct value? No.
+* 7) Remember your order of precedence. Put parentheses around
+*    Fahrenheit - 32. This needs to be done before the multiplication.
+* 8) Stop debugging and recompile.
+*
+* Debugging Exercise 2
+*
+* 1) Run to Breakpoint 1.
+* 2) When asked for a temperature, enter 212.
+* 3) Verify that the value you entered is stored correctly.
+* 4) Step over the conversion calculation. What is the value
+*    in Celsius? Is that the correct value? No.
+* 5) Look at the division. This is integer division. Therefore,
+*    5 / 9 = 0. This is not the result we are looking for.
+* 6) Modify the calculation so that it does floating point division.
+*    There are three different ways we have discussed:
+*           a) use the F suffix on the literals
+*           b) type cast the literals
+*           c) replace the 5 with 5.0 and the 9 with 9.0
+* 7) Stop debugging, recompile and run to verify that it now works
+*    correctly.
+********************************************************************/
+
+#include <iostream>
+#include <iomanip>
+using std::cout;
+using std::cin;
+using std::endl;
+
+int main()
+{
+    float fahrenheit = 0;
+    float celcius = 0;
+
+    cout << "Enter temperature in Fahrenheit: ";
+    cin >> fahrenheit;
+
+    // Breakpoint 1
+    // Put a breakpoint on the following line
+    celcius = 5.0 / 9.0 * (fahrenheit - 32);
+
+    cout << fahrenheit << " degrees F = "
+        << celcius << " degrees C" << endl;
+
+    return 0;
+}
diff --git a/CST116-Ch6-Debugging/CST116-Ch6-Debugging-Psuedocode.txt b/CST116-Ch6-Debugging/CST116-Ch6-Debugging-Psuedocode.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/CST116-Ch6-Debugging/CST116-Ch6-Debugging-Psuedocode.txt
diff --git a/CST116-Ch6-Debugging/CST116-Ch6-DebuggingSolution.txt b/CST116-Ch6-Debugging/CST116-Ch6-Debugging-Solution.txt
index ee7468d..ee7468d 100644
--- a/CST116-Ch6-Debugging/CST116-Ch6-DebuggingSolution.txt
+++ b/CST116-Ch6-Debugging/CST116-Ch6-Debugging-Solution.txt
diff --git a/CST116-Ch6-Debugging/CST116-Ch6-Debugging.vcxproj b/CST116-Ch6-Debugging/CST116-Ch6-Debugging.vcxproj
index 730676b..711d07d 100644
--- a/CST116-Ch6-Debugging/CST116-Ch6-Debugging.vcxproj
+++ b/CST116-Ch6-Debugging/CST116-Ch6-Debugging.vcxproj
@@ -127,10 +127,11 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="CST116-Ch6-Debugging.cpp" />

+    <ClCompile Include="CST116-Ch6-Debugging-Chambers.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <Text Include="CST116-Ch6-DebuggingSolution.txt" />

+    <Text Include="CST116-Ch6-Debugging-Solution.txt" />

+    <Text Include="CST116-Ch6-Debugging-Psuedocode.txt" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/CST116-Ch6-Debugging/CST116-Ch6-Debugging.vcxproj.filters b/CST116-Ch6-Debugging/CST116-Ch6-Debugging.vcxproj.filters
index c10345b..e814baf 100644
--- a/CST116-Ch6-Debugging/CST116-Ch6-Debugging.vcxproj.filters
+++ b/CST116-Ch6-Debugging/CST116-Ch6-Debugging.vcxproj.filters
@@ -15,12 +15,15 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="CST116-Ch6-Debugging.cpp">

+    <ClCompile Include="CST116-Ch6-Debugging-Chambers.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <Text Include="CST116-Ch6-DebuggingSolution.txt">

+    <Text Include="CST116-Ch6-Debugging-Solution.txt">

+      <Filter>Source Files</Filter>

+    </Text>

+    <Text Include="CST116-Ch6-Debugging-Psuedocode.txt">

       <Filter>Source Files</Filter>

     </Text>

   </ItemGroup>