From ecae013c7de2e169d11c849f8041ed91e469390f Mon Sep 17 00:00:00 2001 From: Pablo Cingolani Date: Fri, 19 Dec 2014 09:04:04 -0500 Subject: [PATCH] Tests cases: Reduced verbosity --- .classpath | 10 + .project | 18 ++ .../testCases/TestCaseCommandLine.class | Bin 1396 -> 1494 bytes .../testCases/TestCaseJfuzzy.class | Bin 12073 -> 12035 bytes .../testCases/TestCaseTipper.class | Bin 6823 -> 6844 bytes .../jFuzzyLogic/testCases/TestSuiteAll.class | Bin 1004 -> 1004 bytes .../testCases/TestCaseCommandLine.java | 3 + .../jFuzzyLogic/testCases/TestCaseJfuzzy.java | 257 +++++++++--------- .../jFuzzyLogic/testCases/TestCaseTipper.java | 24 +- .../jFuzzyLogic/testCases/TestSuiteAll.java | 3 + 10 files changed, 175 insertions(+), 140 deletions(-) create mode 100644 .classpath create mode 100644 .project diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..27ece10 --- /dev/null +++ b/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..4c0f3e1 --- /dev/null +++ b/.project @@ -0,0 +1,18 @@ + + + jFuzzyLogic + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.xtext.ui.shared.xtextNature + + diff --git a/bin/net/sourceforge/jFuzzyLogic/testCases/TestCaseCommandLine.class b/bin/net/sourceforge/jFuzzyLogic/testCases/TestCaseCommandLine.class index bfbfc5f2b15b3d6c0df0e30de2267b25aea07547..58021f94c60755cd1bc7210e13318858f4717582 100644 GIT binary patch delta 567 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 X2gT}~o^xG2Rf5c~1)t}0k-YGK^{Gp` literal 12073 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 diff --git a/bin/net/sourceforge/jFuzzyLogic/testCases/TestCaseTipper.class b/bin/net/sourceforge/jFuzzyLogic/testCases/TestCaseTipper.class index 51af62aa0a38c5fc637456edf818c94606ed7814..e29125b3e2cae0f66112ac630ef2441b75dfbb5a 100644 GIT binary patch delta 3303 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 A+yDRo diff --git a/bin/net/sourceforge/jFuzzyLogic/testCases/TestSuiteAll.class b/bin/net/sourceforge/jFuzzyLogic/testCases/TestSuiteAll.class index 77f3526cd6ac1baa960344b8b278b05b534cd783..6b38549d817945cdc74248d227edafb7a8e5a47b 100644 GIT binary patch delta 45 zcmaFE{)T;nIx{2ZWDRC}Rvrd+2Hwdz%)x>J3>*x?415eCKq$%}#UMWU0<#PN&I|{9 delta 45 zcmaFE{)T;nIx{2NWDRC}R!#*vs415fN3?d9d3{ngtlP@sK007J^ B2V?*M diff --git a/src/net/sourceforge/jFuzzyLogic/testCases/TestCaseCommandLine.java b/src/net/sourceforge/jFuzzyLogic/testCases/TestCaseCommandLine.java index e2bd6e4..6000015 100644 --- a/src/net/sourceforge/jFuzzyLogic/testCases/TestCaseCommandLine.java +++ b/src/net/sourceforge/jFuzzyLogic/testCases/TestCaseCommandLine.java @@ -2,6 +2,7 @@ package net.sourceforge.jFuzzyLogic.testCases; import junit.framework.TestCase; import net.sourceforge.jFuzzyLogic.FIS; +import net.sourceforge.jFuzzyLogic.Gpr; import net.sourceforge.jFuzzyLogic.JFuzzyLogic; import org.junit.Assert; @@ -13,6 +14,8 @@ public class TestCaseCommandLine extends TestCase { @Test public void test() { + Gpr.debug("Test"); + // Prepare command line String fileName = "tests/tipper.fcl"; String args[] = { "-noCharts", "-e", fileName, "8.5", "9" }; diff --git a/src/net/sourceforge/jFuzzyLogic/testCases/TestCaseJfuzzy.java b/src/net/sourceforge/jFuzzyLogic/testCases/TestCaseJfuzzy.java index 25cfab1..bd79cda 100644 --- a/src/net/sourceforge/jFuzzyLogic/testCases/TestCaseJfuzzy.java +++ b/src/net/sourceforge/jFuzzyLogic/testCases/TestCaseJfuzzy.java @@ -1,8 +1,8 @@ /** - * + * * JUnit test for jFuzzyLogic - * - * + * + * * @author pcingola@users.sourceforge.net */ package net.sourceforge.jFuzzyLogic.testCases; @@ -16,40 +16,21 @@ import net.sourceforge.jFuzzyLogic.Gpr; import net.sourceforge.jFuzzyLogic.rule.Rule; import net.sourceforge.jFuzzyLogic.rule.RuleBlock; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; /** - * Main testing class - * + * Main testing class + * * @author pcingola@users.sourceforge.net * */ public class TestCaseJfuzzy extends TestCase { - // A small number - static double EPSILON = 0.000001; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUpBeforeClass() throws Exception { - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDownAfterClass() throws Exception { - } + static double EPSILON = 0.000001; // A small number + static boolean verbose = false; // Verbose? /** * Verify that De Morgan's laws are OK - * @param fis */ void checkDeMorgan(FIS fis) { // De Morgan's laws test @@ -84,10 +65,59 @@ public class TestCaseJfuzzy extends TestCase { } } + /** + * Test method for membership function + */ + public void checkMembershipFunction(String title, FIS fis, String membershipFunctionFile) { + Gpr.debug("Test"); + + int mem[][] = loadMembershipFile(membershipFunctionFile); + + if (verbose) System.out.println(fis); + FunctionBlock fb = fis.getFunctionBlock(null); + + for (int ind = 1; ind < mem.length; ind++) { + double value = int100ToDOuble(mem[ind][0]); + + fb.setVariable("inVar", value); + + int poor = doubleToInt100(fb.getVariable("inVar").getMembership("poor")); + int good = doubleToInt100(fb.getVariable("inVar").getMembership("good")); + int excellent = doubleToInt100(fb.getVariable("inVar").getMembership("excellent")); + + if (poor != mem[ind][1]) fail("Membership function " + title + ", poor(" + value + ") should be " + int100ToDOuble(mem[ind][1]) + ", but it is " + int100ToDOuble(poor)); + if (good != mem[ind][2]) fail("Membership function " + title + ", good(" + value + ") should be " + int100ToDOuble(mem[ind][2]) + ", but it is " + int100ToDOuble(good)); + if (excellent != mem[ind][3]) fail("Membership function " + title + ", excellent(" + value + ") should be " + int100ToDOuble(mem[ind][3]) + ", but it is " + int100ToDOuble(excellent)); + } + } + + /** + * Test method for membership function + */ + public void checkMembershipFunction(String title, String fclFile, String membershipFunctionFile) { + int mem[][] = loadMembershipFile(membershipFunctionFile); + + FIS fis = FIS.load(fclFile); + if (verbose) System.out.println(fis); + FunctionBlock fb = fis.getFunctionBlock(null); + + for (int ind = 1; ind < mem.length; ind++) { + double value = int100ToDOuble(mem[ind][0]); + + fb.setVariable("inVar", value); + + int poor = doubleToInt100(fb.getVariable("inVar").getMembership("poor")); + int good = doubleToInt100(fb.getVariable("inVar").getMembership("good")); + int excellent = doubleToInt100(fb.getVariable("inVar").getMembership("excellent")); + + if (poor != mem[ind][1]) fail("Membership function " + title + ", poor(" + value + ") should be " + int100ToDOuble(mem[ind][1]) + ", but it is " + int100ToDOuble(poor)); + if (good != mem[ind][2]) fail("Membership function " + title + ", good(" + value + ") should be " + int100ToDOuble(mem[ind][2]) + ", but it is " + int100ToDOuble(good)); + if (excellent != mem[ind][3]) fail("Membership function " + title + ", excellent(" + value + ") should be " + int100ToDOuble(mem[ind][3]) + ", but it is " + int100ToDOuble(excellent)); + } + } + /** * Round a double to an integer (time 100) - * @param d - * @return */ int doubleToInt100(double d) { return ((int) Math.round(d * 100)); @@ -99,8 +129,6 @@ public class TestCaseJfuzzy extends TestCase { /** * Read a table of numbers as an array of integers - * @param fileName - * @return */ int[][] loadMembershipFile(String fileName) { String file = Gpr.readFile(fileName); @@ -124,23 +152,7 @@ public class TestCaseJfuzzy extends TestCase { * Show a 'separator' line */ public void separator() { - System.out.println("-------------------------------------------------------------------------------"); - } - - /** - * @throws java.lang.Exception - */ - @Override - @Before - public void setUp() throws Exception { - } - - /** - * @throws java.lang.Exception - */ - @Override - @After - public void tearDown() throws Exception { + if (verbose) System.out.println("-------------------------------------------------------------------------------"); } /** @@ -148,34 +160,36 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testDeMorgan() { - System.out.println("Testing De Morgan's law: AND=MIN / OR=MAX"); + Gpr.debug("Test"); + + if (verbose) System.out.println("Testing De Morgan's law: AND=MIN / OR=MAX"); FIS fis = FIS.load("fcl/testDeMorgan_1.fcl"); - System.out.println(fis); + if (verbose) System.out.println(fis); checkDeMorgan(fis); - System.out.println("Testing De Morgan's law: AND=PROD / OR=ASUM (a.k.a. PROB_OR)"); + if (verbose) System.out.println("Testing De Morgan's law: AND=PROD / OR=ASUM (a.k.a. PROB_OR)"); fis = FIS.load("fcl/testDeMorgan_2.fcl"); - System.out.println(fis); + if (verbose) System.out.println(fis); checkDeMorgan(fis); - System.out.println("Testing De Morgan's law: AND=BDIF / OR=BSUM"); + if (verbose) System.out.println("Testing De Morgan's law: AND=BDIF / OR=BSUM"); fis = FIS.load("fcl/testDeMorgan_3.fcl"); - System.out.println(fis); + if (verbose) System.out.println(fis); checkDeMorgan(fis); - System.out.println("Testing De Morgan's law: AND=DMIN / OR=DMAX"); + if (verbose) System.out.println("Testing De Morgan's law: AND=DMIN / OR=DMAX"); fis = FIS.load("fcl/testDeMorgan_4.fcl"); - System.out.println(fis); + if (verbose) System.out.println(fis); checkDeMorgan(fis); - System.out.println("Testing De Morgan's law: AND=NIPMIN / OR=NIPMAX"); + if (verbose) System.out.println("Testing De Morgan's law: AND=NIPMIN / OR=NIPMAX"); fis = FIS.load("fcl/testDeMorgan_5.fcl"); - System.out.println(fis); + if (verbose) System.out.println(fis); checkDeMorgan(fis); - System.out.println("Testing De Morgan's law: AND=HAMACHER / OR=EINSTEIN"); + if (verbose) System.out.println("Testing De Morgan's law: AND=HAMACHER / OR=EINSTEIN"); fis = FIS.load("fcl/testDeMorgan_6.fcl"); - System.out.println(fis); + if (verbose) System.out.println(fis); checkDeMorgan(fis); } @@ -184,8 +198,10 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testFileParsing1() { + Gpr.debug("Test"); + FIS fis = FIS.load("./tests/junit1.fcl", true); - System.out.println(fis); + if (verbose) System.out.println(fis); separator(); } @@ -194,8 +210,10 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testFileParsing2() { + Gpr.debug("Test"); + FIS fis = FIS.load("./tests/junit2.fcl", true); - System.out.println(fis); + if (verbose) System.out.println(fis); separator(); } @@ -204,8 +222,10 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testFileParsing3() { + Gpr.debug("Test"); + FIS fis = FIS.load("./tests/junit3.fcl", true); - System.out.println(fis); + if (verbose) System.out.println(fis); separator(); } @@ -214,8 +234,10 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testFileParsing4() { + Gpr.debug("Test"); + FIS fis = FIS.load("./tests/junit4.fcl", true); - System.out.println(fis); + if (verbose) System.out.println(fis); separator(); } @@ -224,6 +246,8 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testFunctions() { + Gpr.debug("Test"); + // Load tipper fuzzy system FIS fis = FIS.load("./tests/junit_functions.fcl", true); FunctionBlock fb = fis.getFunctionBlock(null); @@ -231,7 +255,7 @@ public class TestCaseJfuzzy extends TestCase { // Load stored results int mem[][] = loadMembershipFile("./tests/junit_functions.txt"); - // Compare running the system vs. stored results + // Compare running the system vs. stored results for (int ind = 0; ind < mem.length; ind++) { // Get input variables from stores results double inVar = int100ToDOuble(mem[ind][0]); @@ -248,61 +272,14 @@ public class TestCaseJfuzzy extends TestCase { } } - /** - * Test method for membership function - */ - public void testMembershipFunction(String title, FIS fis, String membershipFunctionFile) { - int mem[][] = loadMembershipFile(membershipFunctionFile); - - System.out.println(fis); - FunctionBlock fb = fis.getFunctionBlock(null); - - for (int ind = 1; ind < mem.length; ind++) { - double value = int100ToDOuble(mem[ind][0]); - - fb.setVariable("inVar", value); - - int poor = doubleToInt100(fb.getVariable("inVar").getMembership("poor")); - int good = doubleToInt100(fb.getVariable("inVar").getMembership("good")); - int excellent = doubleToInt100(fb.getVariable("inVar").getMembership("excellent")); - - if (poor != mem[ind][1]) fail("Membership function " + title + ", poor(" + value + ") should be " + int100ToDOuble(mem[ind][1]) + ", but it is " + int100ToDOuble(poor)); - if (good != mem[ind][2]) fail("Membership function " + title + ", good(" + value + ") should be " + int100ToDOuble(mem[ind][2]) + ", but it is " + int100ToDOuble(good)); - if (excellent != mem[ind][3]) fail("Membership function " + title + ", excellent(" + value + ") should be " + int100ToDOuble(mem[ind][3]) + ", but it is " + int100ToDOuble(excellent)); - } - } - - /** - * Test method for membership function - */ - public void testMembershipFunction(String title, String fclFile, String membershipFunctionFile) { - int mem[][] = loadMembershipFile(membershipFunctionFile); - - FIS fis = FIS.load(fclFile); - System.out.println(fis); - FunctionBlock fb = fis.getFunctionBlock(null); - - for (int ind = 1; ind < mem.length; ind++) { - double value = int100ToDOuble(mem[ind][0]); - - fb.setVariable("inVar", value); - - int poor = doubleToInt100(fb.getVariable("inVar").getMembership("poor")); - int good = doubleToInt100(fb.getVariable("inVar").getMembership("good")); - int excellent = doubleToInt100(fb.getVariable("inVar").getMembership("excellent")); - - if (poor != mem[ind][1]) fail("Membership function " + title + ", poor(" + value + ") should be " + int100ToDOuble(mem[ind][1]) + ", but it is " + int100ToDOuble(poor)); - if (good != mem[ind][2]) fail("Membership function " + title + ", good(" + value + ") should be " + int100ToDOuble(mem[ind][2]) + ", but it is " + int100ToDOuble(good)); - if (excellent != mem[ind][3]) fail("Membership function " + title + ", excellent(" + value + ") should be " + int100ToDOuble(mem[ind][3]) + ", but it is " + int100ToDOuble(excellent)); - } - } - /** * Test method for membership function */ @Test public void testMembershipFunctionCosine() { - testMembershipFunction("Cosine", "./tests/junit_cosine.fcl", "./tests/junit_cosine.txt"); + Gpr.debug("Test"); + + checkMembershipFunction("Cosine", "./tests/junit_cosine.fcl", "./tests/junit_cosine.txt"); } /** @@ -310,7 +287,9 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testMembershipFunctionDsigm() { - testMembershipFunction("Dsigm", "./tests/junit_dsigm.fcl", "./tests/junit_dsigm.txt"); + Gpr.debug("Test"); + + checkMembershipFunction("Dsigm", "./tests/junit_dsigm.fcl", "./tests/junit_dsigm.txt"); } /** @@ -318,7 +297,9 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testMembershipFunctionGauss() { - testMembershipFunction("Gauss", "./tests/junit_gauss.fcl", "./tests/junit_gauss.txt"); + Gpr.debug("Test"); + + checkMembershipFunction("Gauss", "./tests/junit_gauss.fcl", "./tests/junit_gauss.txt"); } /** @@ -326,7 +307,9 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testMembershipFunctionGbell() { - testMembershipFunction("Gbell", "./tests/junit_gbell.fcl", "./tests/junit_gbell.txt"); + Gpr.debug("Test"); + + checkMembershipFunction("Gbell", "./tests/junit_gbell.fcl", "./tests/junit_gbell.txt"); } /** @@ -334,6 +317,8 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testMembershipFunctionOnLine4() { + Gpr.debug("Test"); + FIS fis = FIS.load("./tests/on_line_variable.fcl"); double i = 4.0; @@ -341,7 +326,7 @@ public class TestCaseJfuzzy extends TestCase { fis.setVariable("inputZeroMed", i); fis.setVariable("inputZeroMax", i + 1.0); - testMembershipFunction("Online", fis, "./tests/on_line_variable_4.txt"); + checkMembershipFunction("Online", fis, "./tests/on_line_variable_4.txt"); } /** @@ -349,6 +334,8 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testMembershipFunctionOnLine5() { + Gpr.debug("Test"); + FIS fis = FIS.load("./tests/on_line_variable.fcl"); double i = 5.0; @@ -356,7 +343,7 @@ public class TestCaseJfuzzy extends TestCase { fis.setVariable("inputZeroMed", i); fis.setVariable("inputZeroMax", i + 1.0); - testMembershipFunction("Online", fis, "./tests/on_line_variable_5.txt"); + checkMembershipFunction("Online", fis, "./tests/on_line_variable_5.txt"); } /** @@ -364,6 +351,8 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testMembershipFunctionOnLine6() { + Gpr.debug("Test"); + FIS fis = FIS.load("./tests/on_line_variable.fcl"); double i = 6.0; @@ -371,7 +360,7 @@ public class TestCaseJfuzzy extends TestCase { fis.setVariable("inputZeroMed", i); fis.setVariable("inputZeroMax", i + 1.0); - testMembershipFunction("Online", fis, "./tests/on_line_variable_6.txt"); + checkMembershipFunction("Online", fis, "./tests/on_line_variable_6.txt"); } /** @@ -379,7 +368,9 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testMembershipFunctionPiecewiseLinear() { - testMembershipFunction("Piecewise_linear", "./tests/junit_piecewise_linear.fcl", "./tests/junit_piecewise_linear.txt"); + Gpr.debug("Test"); + + checkMembershipFunction("Piecewise_linear", "./tests/junit_piecewise_linear.fcl", "./tests/junit_piecewise_linear.txt"); } /** @@ -387,7 +378,9 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testMembershipFunctionSigmoid() { - testMembershipFunction("Sigmoid", "./tests/junit_sigmoid.fcl", "./tests/junit_sigmoid.txt"); + Gpr.debug("Test"); + + checkMembershipFunction("Sigmoid", "./tests/junit_sigmoid.fcl", "./tests/junit_sigmoid.txt"); } /** @@ -395,7 +388,9 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testMembershipFunctionSingletons() { - testMembershipFunction("Singleton", "./tests/junit_singletons.fcl", "./tests/junit_singletons.txt"); + Gpr.debug("Test"); + + checkMembershipFunction("Singleton", "./tests/junit_singletons.fcl", "./tests/junit_singletons.txt"); } /** @@ -403,7 +398,9 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testMembershipFunctionTrapezoid() { - testMembershipFunction("Trapezoid", "./tests/junit_trape.fcl", "./tests/junit_trape.txt"); + Gpr.debug("Test"); + + checkMembershipFunction("Trapezoid", "./tests/junit_trape.fcl", "./tests/junit_trape.txt"); } /** @@ -411,7 +408,9 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testMembershipFunctionTriangular() { - testMembershipFunction("Triangular", "./tests/junit_triang.fcl", "./tests/junit_triang.txt"); + Gpr.debug("Test"); + + checkMembershipFunction("Triangular", "./tests/junit_triang.fcl", "./tests/junit_triang.txt"); } /** @@ -420,9 +419,11 @@ public class TestCaseJfuzzy extends TestCase { */ @Test public void testNAmembership() { + Gpr.debug("Test"); + // FCL.debug = true; FIS fis = FIS.load("./tests/junit_shashankrao.fcl", true); - System.out.println(fis); + if (verbose) System.out.println(fis); // This set of values used to produce a 'NaN' output double ra = 0.5; @@ -438,8 +439,10 @@ public class TestCaseJfuzzy extends TestCase { @Test public void testNoRule() { + Gpr.debug("Test"); + // FCL.debug = true; FIS fis = FIS.load("tests/noRules.fcl", true); - System.out.println(fis); + if (verbose) System.out.println(fis); } } diff --git a/src/net/sourceforge/jFuzzyLogic/testCases/TestCaseTipper.java b/src/net/sourceforge/jFuzzyLogic/testCases/TestCaseTipper.java index ccf2b82..c19606c 100644 --- a/src/net/sourceforge/jFuzzyLogic/testCases/TestCaseTipper.java +++ b/src/net/sourceforge/jFuzzyLogic/testCases/TestCaseTipper.java @@ -7,12 +7,12 @@ import net.sourceforge.jFuzzyLogic.Gpr; import org.antlr.runtime.RecognitionException; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; public class TestCaseTipper extends TestCase { public static final double EPSILON = 0.001; // Error tolerated + static boolean verbose = false; // Verbose? public void createTxtFile() { // Load from 'FCL' file @@ -42,8 +42,6 @@ public class TestCaseTipper extends TestCase { /** * Round a double to an integer (time 100) - * @param d - * @return */ int doubleToInt100(double d) { return ((int) Math.round(d * 100)); @@ -55,8 +53,6 @@ public class TestCaseTipper extends TestCase { /** * Read a table of numbers as an array of integers - * @param fileName - * @return */ int[][] loadMembershipFile(String fileName) { String file = Gpr.readFile(fileName); @@ -76,13 +72,10 @@ public class TestCaseTipper extends TestCase { return vals; } - @Override - @Before - public void setUp() throws Exception { - } - @Test public void test() { + Gpr.debug("Test"); + // Load from 'FCL' file String fileName = "tests/tipper.fcl"; FIS fis = FIS.load(fileName, true); @@ -122,6 +115,8 @@ public class TestCaseTipper extends TestCase { */ @Test public void testStringParsing() { + Gpr.debug("Test"); + String fcl = "FUNCTION_BLOCK tipper_parsed_from_string // Block definition (there may be more than one block per file)\n" + // "\n" + // "VAR_INPUT // Define input variables\n" + // @@ -166,7 +161,7 @@ public class TestCaseTipper extends TestCase { try { FIS fis = FIS.createFromString(fcl, true); - System.out.println(fis); + if (verbose) System.out.println(fis); } catch (RecognitionException e) { fail("RecognitionException:" + e); } @@ -177,6 +172,8 @@ public class TestCaseTipper extends TestCase { */ @Test public void testTipper() { + Gpr.debug("Test"); + // Load tipper fuzzy system FIS fis = FIS.load("./tests/junit_tipper.fcl", true); FunctionBlock fb = fis.getFunctionBlock(null); @@ -208,6 +205,8 @@ public class TestCaseTipper extends TestCase { */ @Test public void testToString() { + Gpr.debug("Test"); + // Load system String fileName = "tests/tipper.fcl"; FIS fis = FIS.load(fileName, true); @@ -222,9 +221,8 @@ public class TestCaseTipper extends TestCase { // Compare both fis (should be identical) boolean ok = fis.toString().equals(fis2.toString()); - System.out.println("Are both fis equal?: " + ok); + if (verbose) System.out.println("Are both fis equal?: " + ok); if (!ok) throw new RuntimeException("FCL code for both fis is not the same."); - } } diff --git a/src/net/sourceforge/jFuzzyLogic/testCases/TestSuiteAll.java b/src/net/sourceforge/jFuzzyLogic/testCases/TestSuiteAll.java index 0b835ec..b49de55 100644 --- a/src/net/sourceforge/jFuzzyLogic/testCases/TestSuiteAll.java +++ b/src/net/sourceforge/jFuzzyLogic/testCases/TestSuiteAll.java @@ -2,6 +2,9 @@ package net.sourceforge.jFuzzyLogic.testCases; import junit.framework.Test; import junit.framework.TestSuite; +import net.sourceforge.jFuzzyLogic.testCases.TestCaseCommandLine; +import net.sourceforge.jFuzzyLogic.testCases.TestCaseJfuzzy; +import net.sourceforge.jFuzzyLogic.testCases.TestCaseTipper; public class TestSuiteAll {