update

ShiqiYu · Dec 13, 2021 · f5dc30d · f5dc30d
1 parent 895cc2c
commit f5dc30d
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/week14/Lecture14.pptx b/week14/Lecture14.pptx
diff --git a/week14/examples/error1.cpp b/week14/examples/error1.cpp
@@ -4,9 +4,9 @@
 
 float ratio(float a, float b)
 {
-    if (fabs(a - b) < FLT_EPSILON)
+    if (fabs(a + b) < FLT_EPSILON)
     {
-        std::cerr << "The two arguments are too close." << std::endl;
+        std::cerr << "The sum of the two arguments is close to zero." << std::endl;
         std::abort();
     }
     return (a - b) / (a + b);

diff --git a/week14/examples/error2.cpp b/week14/examples/error2.cpp
@@ -4,9 +4,9 @@
 
 bool ratio(float a, float b, float & c)
 {
-    if (fabs(a - b) < FLT_EPSILON)
+    if (fabs(a + b) < FLT_EPSILON)
     {
-        std::cerr << "The two arguments are too close." << std::endl;
+        std::cerr << "The sum of the two arguments is close to zero." << std::endl;
         return false;
     }
     c = (a - b) / (a + b);

diff --git a/week14/examples/error3.cpp b/week14/examples/error3.cpp
@@ -4,8 +4,8 @@
 
 float ratio(float a, float b)
 {
-    if (fabs(a - b) < FLT_EPSILON)
-        throw "The two arguments are too close.";
+    if (fabs(a + b) < FLT_EPSILON)
+        throw "The sum of the two arguments is close to zero.";
 
     return (a - b) / (a + b);
 }

diff --git a/week14/examples/error4.cpp b/week14/examples/error4.cpp
@@ -8,8 +8,8 @@ float ratio(float a, float b)
         throw 1;
     if (b < 0)
         throw 2;
-    if (fabs(a - b) < FLT_EPSILON)
-        throw "The two arguments are too close.";
+    if (fabs(a + b) < FLT_EPSILON)
+        throw "The sum of the two arguments is close to zero.";
 
     return (a - b) / (a + b);
 }

diff --git a/week14/examples/error5.cpp b/week14/examples/error5.cpp
@@ -8,8 +8,8 @@ float ratio(float a, float b)
         throw 1;
     if (b < 0)
         throw 2;
-    if (fabs(a - b) < FLT_EPSILON)
-        throw "The two arguments are too close.";
+    if (fabs(a + b) < FLT_EPSILON)
+        throw "The sum of the two arguments is close to zero.";
 
     return (a - b) / (a + b);
 }

diff --git a/week14/examples/nothrow.cpp b/week14/examples/nothrow.cpp
@@ -24,6 +24,12 @@ int main()
     else
         cout << "So bad, null pointer." << endl;
 
+    // for(size_t i = 0; i < length; i++)
+    //     p[i] = i;
+    // size_t sum;
+    // for(size_t i = 0; i < length; i++)
+    //     sum += p[i];
+    // cout << "Sum = " << sum << endl;
     if(p)
         delete [] p;
     return 0;