Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Built-in constraints (depends on improved-negation) #39

Draft
wants to merge 23 commits into
base: neg-and-agg
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
82e56f4
Stratified aggregation
guillembartrina Oct 19, 2023
ae94fe6
Add some tests and examples, fix broken tests
guillembartrina Oct 19, 2023
9c84a88
Handle anonymous variables in grouping atoms, add a few examples
guillembartrina Oct 22, 2023
9fab8d6
Simplify Grouping volcano operator, add constants generated by aggreg…
guillembartrina Oct 23, 2023
84cf40f
Remove unused AST parameter
guillembartrina Oct 26, 2023
5a746a5
Built-in constraints
guillembartrina Oct 30, 2023
21668b7
Built-in constraints
guillembartrina Oct 30, 2023
e5e71c5
Merge branch 'builtin-constraints' of github.com:guillembartrina/cara…
guillembartrina Oct 30, 2023
80f636c
Move creation of static operations, finish StagedSnippet
guillembartrina Nov 1, 2023
eb24a37
Built-in constraints
guillembartrina Oct 30, 2023
5f3088c
Move creation of static operations
guillembartrina Nov 1, 2023
2176b5a
Merge branch 'builtin-constraints' of github.com:guillembartrina/cara…
guillembartrina Nov 1, 2023
0f323c5
Optimize negation: avoid combinatorial explosion
guillembartrina Nov 5, 2023
9bb0349
Add synthetic test
guillembartrina Nov 5, 2023
e062d6e
Add bugfix comment
guillembartrina Nov 7, 2023
5a18074
Optimize negation: avoid combinatorial explosion
guillembartrina Nov 5, 2023
43451f4
Add synthetic test
guillembartrina Nov 5, 2023
0edb4a3
Merge branch 'improved-negation' of github.com:guillembartrina/carac …
guillembartrina Nov 7, 2023
dea321d
Quick fix: Prohibit negated variables from being guarded by aggregate…
guillembartrina Nov 12, 2023
61a817b
Merge branch 'main' into improved-negation
guillembartrina Nov 12, 2023
cdbd3ae
Simplify negation suboperations
guillembartrina Nov 12, 2023
9c4313f
Merge branch 'improved-negation' into builtin-constraints
guillembartrina Nov 12, 2023
5d4b52c
Remove metals files
guillembartrina Nov 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add synthetic test
  • Loading branch information
guillembartrina committed Nov 7, 2023
commit 43451f4edf6801dc2dc007a65cbc6b3e2e400f8e
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package test.examples.small

import buildinfo.BuildInfo
import datalog.dsl.{Constant, Program}
import test.ExampleTestGenerator

import java.nio.file.Paths

class complement_explosion_test extends ExampleTestGenerator("complement_explosion") with complement_explosion
trait complement_explosion {
val factDirectory = s"${BuildInfo.baseDirectory}/src/test/scala/test/examples/complement_explosion/facts"
val toSolve = "derived"
def pretest(program: Program): Unit = {
val dom = program.relation[Constant]("dom")

val base = program.relation[Constant]("base")
val derived = program.relation[Constant]("derived")

val a, b, c, d, e, f = program.variable()

(1 to 100).foreach(x =>
dom(x) :- ()
)

base(1, 2, 3, 4, 5, 6) :- ()
base(11, 12, 13, 14, 15, 16) :- ()

derived(a, b, c, d, e, f) :- (base(a, b, c, d, e, f), !base(f, e, d, c, b, a))
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Int Int Int Int Int Int
1 2 3 4 5 6
11 12 13 14 15 16