Commit a0353b85 authored by Ryan Wisnesky's avatar Ryan Wisnesky
Browse files

fix for peter

parent 58d3b38f

src/catdata/aql/exp/InstExpQuotient.java

+9 −0
Changes for src/catdata/aql/exp/InstExpQuotient.java: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -187,6 +187,13 @@ public final class InstExpQuotient<X,Y> extends InstExp<Ty,En,Sym,Fk,Att,Gen,Sk, 
				Triple<Ctx<Var,Chc<Ty,En>>,Term<Ty,En,Sym,Fk,Att,Gen,Sk>,Term<Ty,En,Sym,Fk,Att,Gen,Sk>>

				eq0 = RawTerm.infer1x(ctx, eq.first, eq.second, null, col, "", J.schema().typeSide.js).first3();

						

				if (J.type(eq0.second).left) {

					throw new RuntimeException("Attempt to equate values at type in quotient: " + eq0.second + " at type " + J.type(eq0.second).l);

				}

				if (J.type(eq0.third).left) {

					throw new RuntimeException("Attempt to equate values at type in quotient: " + eq0.third + " at type " + J.type(eq0.third).l);

				}

			

				eqs0.add(new Pair<>(eq0.second, eq0.third));

				col.eqs.add(new Eq<>(new Ctx<>(), eq0.second, eq0.third));

			} catch (RuntimeException ex) {
@@ -195,6 +202,8 @@ public final class InstExpQuotient<X,Y> extends InstExp<Ty,En,Sym,Fk,Att,Gen,Sk, 
			}

		}



		

		

		AqlOptions strat = new AqlOptions(options, col, env.defaults);

		InitialAlgebra<Ty,En,Sym,Fk,Att,Gen,Sk,ID> 

		initial = new InitialAlgebra<>(strat, J.schema(), col, new It(), Object::toString, Object::toString);

src/catdata/aql/fdm/InitialAlgebra.java

+1 −1
Changes for src/catdata/aql/fdm/InitialAlgebra.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ extends Algebra<Ty, En, Sym, Fk, Att, Gen, Sk, X, Chc<Sk, Pair<X, Att>>> 
	talg(List<Pair<Chc<Sk, Pair<X, Att>>, Term<Ty, Void, Sym, Void, Void, Void, Chc<Sk, Pair<X,Att>>>>> list, Algebra<Ty, En, Sym, Fk, Att, Gen, Sk, X, ?> alg, Collage<Ty,En,Sym,Fk,Att,Gen,Sk> col) {



		List<Eq<Ty, Void, Sym, Void, Void, Void, Chc<Sk, Pair<X, Att>>>> eqs = new LinkedList<>(talg_full(alg, col).eqs);

		System.out.println(eqs);

	//	System.out.println(eqs);

		List<Chc<Sk, Pair<X, Att>>> sks = new LinkedList<>(talg_full(alg, col).sks.keySet());

		Iterator<Chc<Sk, Pair<X, Att>>> sks_it = sks.iterator();