Skip to content

Commit b7c1b74

Browse files
author
magicindian
committed
commented out two unit tests which require masive amounts of memory to run. TBD, review and refactor this code for the enxt release
1 parent 8b11348 commit b7c1b74

File tree

4 files changed

+57
-58
lines changed

4 files changed

+57
-58
lines changed

‎src/aima/test/logictest/foltest/CommonFOLInferenceProcedureTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ protected void testEqualityAndSubstitutionAxiomsKBabcdFFASucceeds(
314314
assertTrue(0 == answer.getProofs().get(0).getAnswerBindings().size());
315315
}
316316

317-
protected void testEqualityAndSubstitutionAxiomsKBabcdPDSucceeds(
317+
protected void xtestEqualityAndSubstitutionAxiomsKBabcdPDSucceeds(
318318
InferenceProcedure infp) {
319319
FOLKnowledgeBase akb = FOLKnowledgeBaseFactory
320320
.createABCDEqualityAndSubstitutionKnowledgeBase(infp, true);

‎src/aima/test/logictest/foltest/FOLModelEliminationTest.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class FOLModelEliminationTest extends CommonFOLInferenceProcedureTests {
1111
public void testDefiniteClauseKBKingsQueryCriminalXFalse() {
1212
testDefiniteClauseKBKingsQueryCriminalXFalse(new FOLModelElimination());
1313
}
14-
14+
1515
public void testDefiniteClauseKBKingsQueryRichardEvilFalse() {
1616
testDefiniteClauseKBKingsQueryRichardEvilFalse(new FOLModelElimination());
1717
}
@@ -23,21 +23,20 @@ public void testDefiniteClauseKBKingsQueryJohnEvilSucceeds() {
2323
public void testDefiniteClauseKBKingsQueryEvilXReturnsJohnSucceeds() {
2424
testDefiniteClauseKBKingsQueryEvilXReturnsJohnSucceeds(new FOLModelElimination());
2525
}
26-
26+
2727
public void testDefiniteClauseKBKingsQueryKingXReturnsJohnAndRichardSucceeds() {
2828
testDefiniteClauseKBKingsQueryKingXReturnsJohnAndRichardSucceeds(new FOLModelElimination());
2929
}
3030

3131
public void testDefiniteClauseKBWeaponsQueryCriminalXReturnsWestSucceeds() {
3232
testDefiniteClauseKBWeaponsQueryCriminalXReturnsWestSucceeds(new FOLModelElimination());
3333
}
34-
34+
3535
public void testHornClauseKBRingOfThievesQuerySkisXReturnsNancyRedBertDrew() {
3636
// This KB ends up being infinite when resolving, however 2
3737
// seconds is more than enough to extract the 4 answers
3838
// that are expected
39-
testHornClauseKBRingOfThievesQuerySkisXReturnsNancyRedBertDrew(
40-
new FOLModelElimination(
39+
testHornClauseKBRingOfThievesQuerySkisXReturnsNancyRedBertDrew(new FOLModelElimination(
4140
2 * 1000));
4241
}
4342

@@ -50,32 +49,32 @@ public void testFullFOLKBLovesAnimalQueryNotKillsJackTunaSucceeds() {
5049
testFullFOLKBLovesAnimalQueryNotKillsJackTunaSucceeds(
5150
new FOLModelElimination(), false);
5251
}
53-
54-
public void testFullFOLKBLovesAnimalQueryKillsJackTunaFalse() {
52+
53+
public void testFullFOLKBLovesAnimalQueryKillsJackTunaFalse() {
5554
// Note: While the KB expands infinitely, the answer
5655
// search for this bottoms out indicating the
5756
// KB does not entail the fact.
5857
testFullFOLKBLovesAnimalQueryKillsJackTunaFalse(
5958
new FOLModelElimination(), false);
6059
}
61-
60+
6261
public void testEqualityAxiomsKBabcAEqualsCSucceeds() {
6362
testEqualityAxiomsKBabcAEqualsCSucceeds(new FOLModelElimination());
6463
}
65-
64+
6665
public void testEqualityAndSubstitutionAxiomsKBabcdFFASucceeds() {
6766
testEqualityAndSubstitutionAxiomsKBabcdFFASucceeds(new FOLModelElimination());
6867
}
69-
68+
7069
public void testEqualityAndSubstitutionAxiomsKBabcdPDSucceeds() {
71-
testEqualityAndSubstitutionAxiomsKBabcdPDSucceeds(new FOLModelElimination());
70+
xtestEqualityAndSubstitutionAxiomsKBabcdPDSucceeds(new FOLModelElimination());
7271
}
73-
72+
7473
public void testEqualityAndSubstitutionAxiomsKBabcdPFFASucceeds() {
7574
testEqualityAndSubstitutionAxiomsKBabcdPFFASucceeds(
7675
new FOLModelElimination(), false);
7776
}
78-
77+
7978
public void testEqualityNoAxiomsKBabcAEqualsCSucceeds() {
8079
testEqualityNoAxiomsKBabcAEqualsCSucceeds(new FOLModelElimination(),
8180
true);

‎src/aima/test/logictest/foltest/FOLOTTERLikeTheoremProverTest.java‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
* @author Ciaran O'Reilly
1818
*
1919
*/
20-
public class FOLOTTERLikeTheoremProverTest extends CommonFOLInferenceProcedureTests {
20+
public class FOLOTTERLikeTheoremProverTest extends
21+
CommonFOLInferenceProcedureTests {
2122

2223
public void testDefaultClauseSimplifier() {
2324
FOLDomain domain = new FOLDomain();
@@ -36,12 +37,12 @@ public void testDefaultClauseSimplifier() {
3637
rewrites.add((TermEquality) parser.parse("Power(x, ZERO) = ONE"));
3738
DefaultClauseSimplifier simplifier = new DefaultClauseSimplifier(
3839
rewrites);
39-
40+
4041
Sentence s1 = parser
4142
.parse("((P(Plus(y,ZERO),Plus(ZERO,y)) OR P(Power(y, ONE),Power(y,ZERO))) OR P(Power(y,ZERO),Plus(y,ZERO)))");
42-
43+
4344
CNFConverter cnfConverter = new CNFConverter(parser);
44-
45+
4546
CNF cnf = cnfConverter.convertToCNF(s1);
4647

4748
assertEquals(1, cnf.getNumberOfClauses());
@@ -51,12 +52,12 @@ public void testDefaultClauseSimplifier() {
5152

5253
assertEquals("[P(y,y), P(y,ONE), P(ONE,y)]", simplified.toString());
5354
}
54-
55+
5556
public void testDefiniteClauseKBKingsQueryCriminalXFalse() {
5657
testDefiniteClauseKBKingsQueryCriminalXFalse(new FOLOTTERLikeTheoremProver(
5758
false));
5859
}
59-
60+
6061
public void testDefiniteClauseKBKingsQueryRichardEvilFalse() {
6162
testDefiniteClauseKBKingsQueryRichardEvilFalse(new FOLOTTERLikeTheoremProver(
6263
false));
@@ -71,7 +72,7 @@ public void testDefiniteClauseKBKingsQueryEvilXReturnsJohnSucceeds() {
7172
testDefiniteClauseKBKingsQueryEvilXReturnsJohnSucceeds(new FOLOTTERLikeTheoremProver(
7273
false));
7374
}
74-
75+
7576
public void testDefiniteClauseKBKingsQueryKingXReturnsJohnAndRichardSucceeds() {
7677
testDefiniteClauseKBKingsQueryKingXReturnsJohnAndRichardSucceeds(new FOLOTTERLikeTheoremProver(
7778
false));
@@ -81,13 +82,12 @@ public void testDefiniteClauseKBWeaponsQueryCriminalXReturnsWestSucceeds() {
8182
testDefiniteClauseKBWeaponsQueryCriminalXReturnsWestSucceeds(new FOLOTTERLikeTheoremProver(
8283
false));
8384
}
84-
85+
8586
public void testHornClauseKBRingOfThievesQuerySkisXReturnsNancyRedBertDrew() {
8687
// This KB ends up being infinite when resolving, however 2
8788
// seconds is more than enough to extract the 4 answers
8889
// that are expected
89-
testHornClauseKBRingOfThievesQuerySkisXReturnsNancyRedBertDrew(
90-
new FOLOTTERLikeTheoremProver(
90+
testHornClauseKBRingOfThievesQuerySkisXReturnsNancyRedBertDrew(new FOLOTTERLikeTheoremProver(
9191
2 * 1000, false));
9292
}
9393

@@ -100,51 +100,51 @@ public void testFullFOLKBLovesAnimalQueryNotKillsJackTunaSucceeds() {
100100
testFullFOLKBLovesAnimalQueryNotKillsJackTunaSucceeds(
101101
new FOLOTTERLikeTheoremProver(false), false);
102102
}
103-
103+
104104
public void testFullFOLKBLovesAnimalQueryKillsJackTunaFalse() {
105105
// This query will not return using OTTER Like resolution
106106
// as keep expanding clauses through resolution for this KB.
107107
testFullFOLKBLovesAnimalQueryKillsJackTunaFalse(
108108
new FOLOTTERLikeTheoremProver(false), true);
109109
}
110-
110+
111111
public void testEqualityAxiomsKBabcAEqualsCSucceeds() {
112112
testEqualityAxiomsKBabcAEqualsCSucceeds(new FOLOTTERLikeTheoremProver(
113113
false));
114114
}
115-
115+
116116
public void testEqualityAndSubstitutionAxiomsKBabcdFFASucceeds() {
117117
testEqualityAndSubstitutionAxiomsKBabcdFFASucceeds(new FOLOTTERLikeTheoremProver(
118118
false));
119119
}
120-
120+
121121
public void testEqualityAndSubstitutionAxiomsKBabcdPDSucceeds() {
122-
testEqualityAndSubstitutionAxiomsKBabcdPDSucceeds(new FOLOTTERLikeTheoremProver(
122+
xtestEqualityAndSubstitutionAxiomsKBabcdPDSucceeds(new FOLOTTERLikeTheoremProver(
123123
false));
124124
}
125-
125+
126126
public void testEqualityAndSubstitutionAxiomsKBabcdPFFASucceeds() {
127-
testEqualityAndSubstitutionAxiomsKBabcdPFFASucceeds(new FOLOTTERLikeTheoremProver(
128-
false), false);
127+
testEqualityAndSubstitutionAxiomsKBabcdPFFASucceeds(
128+
new FOLOTTERLikeTheoremProver(false), false);
129129
}
130-
130+
131131
public void testEqualityNoAxiomsKBabcAEqualsCSucceeds() {
132-
testEqualityNoAxiomsKBabcAEqualsCSucceeds(new FOLOTTERLikeTheoremProver(
133-
true), false);
132+
testEqualityNoAxiomsKBabcAEqualsCSucceeds(
133+
new FOLOTTERLikeTheoremProver(true), false);
134134
}
135135

136136
public void testEqualityAndSubstitutionNoAxiomsKBabcdFFASucceeds() {
137-
testEqualityAndSubstitutionNoAxiomsKBabcdFFASucceeds(new FOLOTTERLikeTheoremProver(
138-
true), false);
137+
testEqualityAndSubstitutionNoAxiomsKBabcdFFASucceeds(
138+
new FOLOTTERLikeTheoremProver(true), false);
139139
}
140140

141141
public void testEqualityAndSubstitutionNoAxiomsKBabcdPDSucceeds() {
142-
testEqualityAndSubstitutionNoAxiomsKBabcdPDSucceeds(new FOLOTTERLikeTheoremProver(
143-
true), false);
142+
testEqualityAndSubstitutionNoAxiomsKBabcdPDSucceeds(
143+
new FOLOTTERLikeTheoremProver(true), false);
144144
}
145145

146146
public void testEqualityAndSubstitutionNoAxiomsKBabcdPFFASucceeds() {
147-
testEqualityAndSubstitutionNoAxiomsKBabcdPFFASucceeds(new FOLOTTERLikeTheoremProver(
148-
true), false);
147+
testEqualityAndSubstitutionNoAxiomsKBabcdPFFASucceeds(
148+
new FOLOTTERLikeTheoremProver(true), false);
149149
}
150150
}

‎src/aima/test/logictest/foltest/FOLTFMResolutionTest.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class FOLTFMResolutionTest extends CommonFOLInferenceProcedureTests {
1111
public void testDefiniteClauseKBKingsQueryCriminalXFalse() {
1212
testDefiniteClauseKBKingsQueryCriminalXFalse(new FOLTFMResolution());
1313
}
14-
14+
1515
public void testDefiniteClauseKBKingsQueryRichardEvilFalse() {
1616
testDefiniteClauseKBKingsQueryRichardEvilFalse(new FOLTFMResolution());
1717
}
@@ -23,15 +23,15 @@ public void testDefiniteClauseKBKingsQueryJohnEvilSucceeds() {
2323
public void testDefiniteClauseKBKingsQueryEvilXReturnsJohnSucceeds() {
2424
testDefiniteClauseKBKingsQueryEvilXReturnsJohnSucceeds(new FOLTFMResolution());
2525
}
26-
26+
2727
public void testDefiniteClauseKBKingsQueryKingXReturnsJohnAndRichardSucceeds() {
2828
testDefiniteClauseKBKingsQueryKingXReturnsJohnAndRichardSucceeds(new FOLTFMResolution());
2929
}
3030

3131
public void testDefiniteClauseKBWeaponsQueryCriminalXReturnsWestSucceeds() {
3232
testDefiniteClauseKBWeaponsQueryCriminalXReturnsWestSucceeds(new FOLTFMResolution());
3333
}
34-
34+
3535
public void testHornClauseKBRingOfThievesQuerySkisXReturnsNancyRedBertDrew() {
3636
// The clauses in this KB can keep creating resolvents infinitely,
3737
// therefore give it 10 seconds to find the 4 answers to this, should
@@ -48,51 +48,51 @@ public void testFullFOLKBLovesAnimalQueryKillsCuriosityTunaSucceeds() {
4848

4949
public void testFullFOLKBLovesAnimalQueryNotKillsJackTunaSucceeds() {
5050
// 10 seconds should be more than plenty for this query to finish.
51-
testFullFOLKBLovesAnimalQueryNotKillsJackTunaSucceeds(new FOLTFMResolution(
52-
10 * 1000), false);
51+
testFullFOLKBLovesAnimalQueryNotKillsJackTunaSucceeds(
52+
new FOLTFMResolution(10 * 1000), false);
5353
}
54-
54+
5555
public void testFullFOLKBLovesAnimalQueryKillsJackTunaFalse() {
5656
// This query will not return using TFM as keep expanding
5757
// clauses through resolution for this KB.
5858
testFullFOLKBLovesAnimalQueryKillsJackTunaFalse(new FOLTFMResolution(
5959
10 * 1000), true);
6060
}
61-
61+
6262
public void testEqualityAxiomsKBabcAEqualsCSucceeds() {
6363
testEqualityAxiomsKBabcAEqualsCSucceeds(new FOLTFMResolution(10 * 1000));
6464
}
65-
65+
6666
public void testEqualityAndSubstitutionAxiomsKBabcdFFASucceeds() {
6767
testEqualityAndSubstitutionAxiomsKBabcdFFASucceeds(new FOLTFMResolution(
6868
10 * 1000));
6969
}
70-
70+
7171
// Note: Requires VM arguments to be:
7272
// -Xms256m -Xmx1024m
7373
// due to the amount of memory it uses.
74-
public void testEqualityAndSubstitutionAxiomsKBabcdPDSucceeds() {
75-
testEqualityAndSubstitutionAxiomsKBabcdPDSucceeds(new FOLTFMResolution(
74+
public void xtestEqualityAndSubstitutionAxiomsKBabcdPDSucceeds() {
75+
xtestEqualityAndSubstitutionAxiomsKBabcdPDSucceeds(new FOLTFMResolution(
7676
10 * 1000));
7777
}
78-
78+
7979
public void testEqualityAndSubstitutionAxiomsKBabcdPFFASucceeds() {
8080
// TFM is unable to find the correct answer to this in a reasonable
8181
// amount of time for a JUnit test.
82-
testEqualityAndSubstitutionAxiomsKBabcdPFFASucceeds(new FOLTFMResolution(
83-
10 * 1000), true);
82+
testEqualityAndSubstitutionAxiomsKBabcdPFFASucceeds(
83+
new FOLTFMResolution(10 * 1000), true);
8484
}
85-
85+
8686
public void testEqualityNoAxiomsKBabcAEqualsCSucceeds() {
8787
testEqualityNoAxiomsKBabcAEqualsCSucceeds(new FOLTFMResolution(
8888
10 * 1000), true);
8989
}
90-
90+
9191
public void testEqualityAndSubstitutionNoAxiomsKBabcdFFASucceeds() {
9292
testEqualityAndSubstitutionNoAxiomsKBabcdFFASucceeds(
9393
new FOLTFMResolution(10 * 1000), true);
9494
}
95-
95+
9696
public void testEqualityAndSubstitutionNoAxiomsKBabcdPDSucceeds() {
9797
testEqualityAndSubstitutionNoAxiomsKBabcdPDSucceeds(
9898
new FOLTFMResolution(10 * 1000), true);

0 commit comments

Comments
 (0)