-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
upgrade to projog-clp v0.3.0 - resolves #215
min, max and // can now be used in CLP expressions
- Loading branch information
Showing
9 changed files
with
322 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletions
113
src/test/java/org/projog/core/predicate/builtin/clp/CommonExpressionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| /* | ||
| * Copyright 2023 S. Webber | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.projog.core.predicate.builtin.clp; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertSame; | ||
|
|
||
| import org.junit.Test; | ||
| import org.projog.clp.Expression; | ||
| import org.projog.clp.FixedValue; | ||
| import org.projog.clp.math.Absolute; | ||
| import org.projog.clp.math.Add; | ||
| import org.projog.clp.math.Divide; | ||
| import org.projog.clp.math.Maximum; | ||
| import org.projog.clp.math.Minimum; | ||
| import org.projog.clp.math.Minus; | ||
| import org.projog.clp.math.Multiply; | ||
| import org.projog.clp.math.Subtract; | ||
|
|
||
| public class CommonExpressionTest { | ||
| @Test | ||
| public void testMinus() { | ||
| ExpressionFactory f = CommonExpression.minus(); | ||
| Expression e = f.createExpression(new Expression[] {new FixedValue(7)}); | ||
|
|
||
| assertSame(Minus.class, e.getClass()); | ||
| assertEquals(-7L, e.getMax(null)); | ||
| assertEquals(-7L, e.getMin(null)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAbsolute() { | ||
| ExpressionFactory f = CommonExpression.absolute(); | ||
| Expression e = f.createExpression(new Expression[] {new FixedValue(-7)}); | ||
|
|
||
| assertSame(Absolute.class, e.getClass()); | ||
| assertEquals(7L, e.getMax(null)); | ||
| assertEquals(7L, e.getMin(null)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAdd() { | ||
| ExpressionFactory f = CommonExpression.add(); | ||
| Expression e = f.createExpression(new Expression[] {new FixedValue(7), new FixedValue(3)}); | ||
|
|
||
| assertSame(Add.class, e.getClass()); | ||
| assertEquals(10L, e.getMax(null)); | ||
| assertEquals(10L, e.getMin(null)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSubtract() { | ||
| ExpressionFactory f = CommonExpression.subtract(); | ||
| Expression e = f.createExpression(new Expression[] {new FixedValue(7), new FixedValue(3)}); | ||
|
|
||
| assertSame(Subtract.class, e.getClass()); | ||
| assertEquals(4L, e.getMax(null)); | ||
| assertEquals(4L, e.getMin(null)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMultiply() { | ||
| ExpressionFactory f = CommonExpression.multiply(); | ||
| Expression e = f.createExpression(new Expression[] {new FixedValue(7), new FixedValue(3)}); | ||
|
|
||
| assertSame(Multiply.class, e.getClass()); | ||
| assertEquals(21L, e.getMax(null)); | ||
| assertEquals(21L, e.getMin(null)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDivide() { | ||
| ExpressionFactory f = CommonExpression.divide(); | ||
| Expression e = f.createExpression(new Expression[] {new FixedValue(27), new FixedValue(3)}); | ||
|
|
||
| assertSame(Divide.class, e.getClass()); | ||
| assertSame(9L, e.getMax(null)); | ||
| assertSame(9L, e.getMin(null)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMaximum() { | ||
| ExpressionFactory f = CommonExpression.maximum(); | ||
| Expression e = f.createExpression(new Expression[] {new FixedValue(123), new FixedValue(456)}); | ||
|
|
||
| assertSame(Maximum.class, e.getClass()); | ||
| assertEquals(456L, e.getMax(null)); | ||
| assertEquals(456L, e.getMin(null)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMinimum() { | ||
| ExpressionFactory f = CommonExpression.minimum(); | ||
| Expression e = f.createExpression(new Expression[] {new FixedValue(123), new FixedValue(456)}); | ||
|
|
||
| assertSame(Minimum.class, e.getClass()); | ||
| assertEquals(123L, e.getMax(null)); | ||
| assertEquals(123L, e.getMin(null)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| full_adder(Input1,Input2,Input3,Output1,Output2) :- | ||
| Output1 #<==> (Input1 #\ Input2) #\ Input3, | ||
| Output2 #<==> (Input1 #/\ Input2) #\/ (Input3 #/\ (Input1 #\ Input2)). | ||
|
|
||
| %?- full_adder(1,1,1,Output1,Output2) | ||
| % Output1 = 1 | ||
| % Output2 = 1 | ||
|
|
||
| %?- full_adder(1,1,0,Output1,Output2) | ||
| % Output1 = 0 | ||
| % Output2 = 1 | ||
|
|
||
| %?- full_adder(1,0,1,Output1,Output2) | ||
| % Output1 = 0 | ||
| % Output2 = 1 | ||
|
|
||
| %?- full_adder(0,1,1,Output1,Output2) | ||
| % Output1 = 0 | ||
| % Output2 = 1 | ||
|
|
||
| %?- full_adder(1,0,0,Output1,Output2) | ||
| % Output1 = 1 | ||
| % Output2 = 0 | ||
|
|
||
| %?- full_adder(0,1,0,Output1,Output2) | ||
| % Output1 = 1 | ||
| % Output2 = 0 | ||
|
|
||
| %?- full_adder(0,0,1,Output1,Output2) | ||
| % Output1 = 1 | ||
| % Output2 = 0 | ||
|
|
||
| %?- full_adder(0,0,0,Output1,Output2) | ||
| % Output1 = 0 | ||
| % Output2 = 0 | ||
|
|
||
| %?- full_adder(0,Input2,Input3,Output1,1) | ||
| % Input2 = 1 | ||
| % Input3 = 1 | ||
| % Output1 = 0 | ||
|
|
||
| %?- full_adder(Input1,0,Input3,Output1,1) | ||
| % Input1 = 1 | ||
| % Input3 = 1 | ||
| % Output1 = 0 | ||
|
|
||
| %?- full_adder(Input1,Input2,0,Output1,1) | ||
| % Input1 = 1 | ||
| % Input2 = 1 | ||
| % Output1 = 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| Full Adder | ||
| <p> | ||
| A <a href="https://en.wikipedia.org/wiki/Adder_(electronics)#Full_adder">full adder</a> adds three binary numbers. | ||
| </p> | ||
| <p> | ||
| The truth table for a full adder is: | ||
| <table style="border: 1px solid black"> | ||
| <tr><th>Input 1</th><th>Input 2</th><th>Input 3</th><th>Output 1</th><th>Output 2</th></tr> | ||
| <tr><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr> | ||
| <tr><td>1</td><td>0</td><td>0</td><td>1</td><td>0</td></tr> | ||
| <tr><td>0</td><td>1</td><td>0</td><td>1</td><td>0</td></tr> | ||
| <tr><td>0</td><td>0</td><td>1</td><td>1</td><td>0</td></tr> | ||
| <tr><td>1</td><td>1</td><td>0</td><td>0</td><td>1</td></tr> | ||
| <tr><td>1</td><td>0</td><td>1</td><td>0</td><td>1</td></tr> | ||
| <tr><td>0</td><td>1</td><td>1</td><td>0</td><td>1</td></tr> | ||
| <tr><td>1</td><td>1</td><td>1</td><td>1</td><td>1</td></tr> | ||
| </table> | ||
| </p> |
Oops, something went wrong.