From 0fa45bc410d15fe4796b088a66f7b04f292b836f Mon Sep 17 00:00:00 2001 From: Martin Goik <goik@hdm-stuttgart.de> Date: Tue, 31 Mar 2015 05:51:06 +0200 Subject: [PATCH] Changing default number of series terms from 1 to 5 --- Doc/Sd1/loop.xml | 67 +++++++++++++++++-- .../de/hdm_stuttgart/de/sd1/math/Math.java | 2 +- .../de/hdm_stuttgart/de/sd1/math/Math.java | 2 +- .../de/hdm_stuttgart/de/sd1/math/Math.java | 2 +- .../de/hdm_stuttgart/de/sd1/math/Math.java | 2 +- 5 files changed, 65 insertions(+), 10 deletions(-) diff --git a/Doc/Sd1/loop.xml b/Doc/Sd1/loop.xml index 393ef5933..31286bd3f 100644 --- a/Doc/Sd1/loop.xml +++ b/Doc/Sd1/loop.xml @@ -1254,16 +1254,71 @@ public class Math { <para role="eclipse">Sd1/math/V1</para> </annotation> - <para>Regarding the finite number of terms we implement the last - index to be considered as a class variable <coref - linkend="sd1ListingSeriesLimit"/> having default value 1. We also - provide a corresponding setter method <coref + <para>Regarding the finite number of terms we provide a class + variable <coref linkend="sd1ListingSeriesLimit"/> having default + value of 5 corresponding to just the first 1 + 5 = 6 terms:</para> + + <informalequation> + <m:math display="block"> + <m:mrow> + <m:msup> + <m:mi>e</m:mi> + + <m:mi>x</m:mi> + </m:msup> + + <m:mo>≈</m:mo> + + <m:mrow> + <m:mi>1</m:mi> + + <m:mo>+</m:mo> + + <m:mfrac> + <m:msup> + <m:mi>x</m:mi> + + <m:mi>1</m:mi> + </m:msup> + + <m:mrow> + <m:mi>1</m:mi> + + <m:mo>!</m:mo> + </m:mrow> + </m:mfrac> + + <m:mo>+</m:mo> + + <m:mi>...</m:mi> + + <m:mo>+</m:mo> + + <m:mfrac> + <m:msup> + <m:mi>x</m:mi> + + <m:mi>5</m:mi> + </m:msup> + + <m:mrow> + <m:mi>5</m:mi> + + <m:mo>!</m:mo> + </m:mrow> + </m:mfrac> + </m:mrow> + </m:mrow> + </m:math> + </informalequation> + + <para>We also provide a corresponding setter method <coref linkend="sd1ListingSeriesLimitSetter"/> enabling users of our - class to choose an appropriate value:</para> + class to choose a different value:</para> <programlisting language="java">public class Math { - static int <emphasis role="bold">seriesLimit = 1</emphasis>; <co + static int <emphasis role="bold">seriesLimit = 5</emphasis>; <co xml:id="sd1ListingSeriesLimit"/> /** diff --git a/P/Sd1/math/V1/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java b/P/Sd1/math/V1/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java index b445a5a22..2f85fa005 100644 --- a/P/Sd1/math/V1/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java +++ b/P/Sd1/math/V1/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java @@ -10,7 +10,7 @@ package de.hdm_stuttgart.de.sd1.math; */ public class Math { - static int seriesLimit = 1; + static int seriesLimit = 5; /** * diff --git a/P/Sd1/math/V2/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java b/P/Sd1/math/V2/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java index 42ba8bd33..a840e312c 100644 --- a/P/Sd1/math/V2/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java +++ b/P/Sd1/math/V2/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java @@ -10,7 +10,7 @@ package de.hdm_stuttgart.de.sd1.math; */ public class Math { - static int seriesLimit = 1; + static int seriesLimit = 5; /** * diff --git a/P/Sd1/math/V3/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java b/P/Sd1/math/V3/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java index b30109d36..bbfd92689 100644 --- a/P/Sd1/math/V3/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java +++ b/P/Sd1/math/V3/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java @@ -10,7 +10,7 @@ package de.hdm_stuttgart.de.sd1.math; */ public class Math { - static int seriesLimit = 1; + static int seriesLimit = 5; /** * diff --git a/P/Sd1/math/V4/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java b/P/Sd1/math/V4/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java index c1a1cb94d..71a7738af 100644 --- a/P/Sd1/math/V4/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java +++ b/P/Sd1/math/V4/src/main/java/de/hdm_stuttgart/de/sd1/math/Math.java @@ -12,7 +12,7 @@ public class Math { private static final double PI = java.lang.Math.PI; - static int seriesLimit = 1; + static int seriesLimit = 5; /** * -- GitLab