Merge pull request #370 from Don-Ward/FxPt-Correction

Corrections to the fixed point arithmetic class.

tests/unicon/FxPtTests.icn

@@ -355,6 +355,10 @@ procedure test_division()
    T.verify {"(-5/6)*(6/-5) = 1",  FxPt(-5).div(six).mul(six.div(-5)).round(50).eq(1) }
    T.verify {"(5/-6)*(6/-5) = 1",  five.div(-6).mul(six.div(-5)).round(50).eq(1) }
 
+   T.verify {"1.div(6,10)",  FxPt(1).div(six,10).toString() == "0.1666666667" }
+   T.verify {"4.div(6,15)",  four.div(six,15).toString() == "0.666666666666667" }
+   T.verify {"9.div(6,3)",   FxPt(9).div(six,3).toString() == "1.500" }
+
    # This test takes 99.9% of the run time; disable it if you're repeatedly running tests
    # by uncommenting the next line.
    # return

tests/unicon/stand/FxPtTest.std

@@ -1,4 +1,4 @@
 --------------------------------------------------
           Fixed Point Tests Start
-          Fixed Point Tests Passed = 454 Failed = 0
+          Fixed Point Tests Passed = 457 Failed = 0
 --------------------------------------------------

tests/unicon/stand/FxPtTest_OVLD.std

@@ -1,4 +1,4 @@
 --------------------------------------------------
           Fixed Point Tests Start
-          Fixed Point Tests Passed = 586 Failed = 0
+          Fixed Point Tests Passed = 589 Failed = 0
 --------------------------------------------------

uni/lib/FxPt.icn

@@ -83,9 +83,10 @@ class FxPt: _FxPt()
    # Divide another fixed-point value or number from this FxPt.
    # <[returns result of the division as a FxPt]>
    #</p>
-   method div(fp       # fixed-point of number
+   method div(fp,      # fixed-point of number
+              places   # places
              )
-      return FxPt(self$_FxPt.div(_toFxPt(fp)))
+      return FxPt(self$_FxPt.div(_toFxPt(fp), places))
    end
 
    #<p>
@@ -494,7 +495,8 @@ $endif          # FXPT_DEBUG
    end
 
    method div(fp, places)   # divide this by fp
-      return self.mul(fp._reciprocal(places))
+      /places := 200 # We have to stop somewhere
+      return self.mul(fp._reciprocal(places+1)).round(places)
    end
 
    method round(p1)  # round away from zero to p1 decimal places