Commit 9b5dfda4 authored by Ryan Wisnesky's avatar Ryan Wisnesky
Browse files

remove numbers from chase expressions because thanks to timeouts they are pointless

parent ab6c7231

resources/examples/aql/All_Syntax.aql

+1 −1
Changes for resources/examples/aql/All_Syntax.aql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ instance i9 = coproduct i1 + i1 : s3 { options prover = completion } 
instance i10 = coproduct_sigma (identity s3) i1 (identity s3) i1 : s3 { options prover = completion }

instance i20 = coproduct_unrestricted i1 + i2 : s3 { options prover = completion }

instance i11 = coequalize (identity i1) (identity i1) { options prover = completion }

instance i12 = chase literal : s3 { } i3 1

instance i12 = chase literal : s3 { } i3 

instance i15 = anonymize i12

//random -- see Employees example

//import_jdbc -- see JDBC example

resources/examples/aql/CSV.aql

+1 −1
Changes for resources/examples/aql/CSV.aql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -171,5 +171,5 @@ instance I2 = literal : T2 { 
}



//set the foreign keys to be the join of att and _id

instance J2 = chase C I2 6

instance J2 = chase C I2

resources/examples/aql/Constraints.aql

+1 −2
Changes for resources/examples/aql/Constraints.aql: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ instance I = literal : ST { 
//The three EDs are 'weakly acyclic'.  Thus we know any chase sequence will terminate in polynomial time.

//J = Dept(cs, null1, null2), Emp(1, cs), Emp(null2, cs)

//intuitively, null2 = alice's manager id, null3 = alice's manager's name 

//3 is number of times to iterate the chase

instance J = chase theEDs I 3

instance J = chase theEDs I 



command JisOk1 = check theEDs J //verify the chased instance satisfies the EDs

resources/examples/aql/Pullback.aql

+1 −1
Changes for resources/examples/aql/Pullback.aql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ constraints pullbackED = literal : Square { 
		c.C_att = a.A_attC

}



instance L = chase pullbackED K 3

instance L = chase pullbackED K

src/catdata/Chc.java

+5 −4
Changes for src/catdata/Chc.java: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -127,10 +127,11 @@ public class Chc<X,Y> implements Serializable /*, Comparable<Chc<X,Y>> */ { 
        if (getClass() != obj.getClass())

            return false;

        Chc<?,?> other = (Chc<?,?>) obj;

       return new EqualsBuilder()

		.append(left, other.left)

		.append(l, other.l)

		.append(r, other.r).isEquals();

       if (!(left == other.left)) {

    	   		return false;

       }

       return (left && l.equals(other.l)) || ((!left) && r.equals(other.r));

       

    }



	public void assertNeitherNull() {