Deleted the example file within cnp

UppsalaIM · Feb 18, 2019 · 832303c · 832303c
1 parent 3772048
commit 832303c
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 222 deletions.
diff --git a/cnp/cnp_lib.pl b/cnp/cnp_lib.pl
diff --git a/cnp/cnp_syn.pl b/cnp/cnp_syn.pl
@@ -1,7 +1,7 @@
 :- use_module(library(lists)).
 :- use_module(library(aggregate)).
 :- use_module(library(clpfd)).
-:- multifile libPredicate/3.
+
 :- multifile jobValence/1.
 :- multifile jobConstant/1.
 :- multifile jobObservable/2.
@@ -106,8 +106,6 @@
   valenceAnde(ValenceAnd, ValenceP, ValenceQ),
   % print([valenceAnde, ValenceAnd, ValenceP, ValenceQ, example, Examples]), nl,
   searchLogProgress("ande", MaxHeight, ValenceAnd),
-  % argNames(NamesP, ValenceP),
-  % argNames(NamesQ, ValenceQ),
   disjoinExamples(ValenceP, Examples, ExamplesP),
   syn(P, ande, SubMaxHeight, ValenceP, ExamplesP),
   disjoinExamples(ValenceQ, Examples, ExamplesQ),
@@ -124,34 +122,22 @@
   unprojExamplesToValence(Examples, Projs, ValenceProj, ValenceQ, ExamplesUnproj),
   syn(Q, proj, SubMaxHeight, ValenceQ, ExamplesUnproj).
 
-% syn(foldr2(P,Q), ParentOp, MaxHeight, ValenceFoldr2, Examples) :-
-%   MaxHeight>=2,
-%   SubMaxHeight is MaxHeight-1,
-%   ParentOp\=ore,
-%   valenceFoldr2(ValenceFoldr2, ValenceP, ValenceQ),
-%   searchLogProgress("foldr2", MaxHeight, ValenceFoldr2),
-%   syn_foldr2(P, ValenceP, Q, ValenceQ, SubMaxHeight, Examples).
-%
-% syn(foldr(P,Q), ParentOp, MaxHeight, ValenceFoldr, Examples) :-
-%   MaxHeight>=2,
-%   SubMaxHeight is MaxHeight-1,
-%   ParentOp \= ore, ParentOp \= foldr,
-%   %dif(ParentOp, ore), dif(ParentOp, foldr),
-%   valenceFoldr(ValenceFoldr, ValenceP, ValenceQ),
-%   searchLogProgress("foldr", MaxHeight, ValenceFoldr),
-%   syn_foldr(P, ValenceP, Q, ValenceQ, SubMaxHeight, Examples).
-
-% syn_iif(P, ValenceP, Q, R, ValenceQR, SubMaxHeight, [Eqr|ExamplesP], [Eqr|ExamplesQR]) :-
-%   syn(P, iif, SubMaxHeight, ValenceP, [E]),
-
-% syn_iif_find_QRConstants(Valence, _, _, _,) :- Valence\=[o:out], throw('Valence for QR needs to be [o:out].').
-% syn_iif_find_QRConstants(_, [], _, _,).
-% syn_iif_find_QRConstants([o:out], [[o:V]|Extail], QConstant, RConstant) :-
-%   (V=QConstant, V=RConstant),
-%   syn_iif_find_QRConstants([o:out], Extail, QConstant, RConstant).
-
-
-%syn_iif_filterPExamples(ValenceP, ValenceQR, Examples, PPos, PNeg, Q, R),
+syn(foldr2(P,Q), ParentOp, MaxHeight, ValenceFoldr2, Examples) :-
+  MaxHeight>=2,
+  SubMaxHeight is MaxHeight-1,
+  ParentOp\=ore,
+  valenceFoldr2(ValenceFoldr2, ValenceP, ValenceQ),
+  searchLogProgress("foldr2", MaxHeight, ValenceFoldr2),
+  syn_foldr2(P, ValenceP, Q, ValenceQ, SubMaxHeight, Examples).
+
+syn(foldr(P,Q), ParentOp, MaxHeight, ValenceFoldr, Examples) :-
+  MaxHeight>=2,
+  SubMaxHeight is MaxHeight-1,
+  ParentOp \= ore, ParentOp \= foldr,
+  %dif(ParentOp, ore), dif(ParentOp, foldr),
+  valenceFoldr(ValenceFoldr, ValenceP, ValenceQ),
+  searchLogProgress("foldr", MaxHeight, ValenceFoldr),
+  syn_foldr(P, ValenceP, Q, ValenceQ, SubMaxHeight, Examples).
 
 %syn_iif_filterPExamples(PValence, QRValence, Examples, PPositiveExamples, PNegativeExamples, QConst, RConst) :-
 syn_iif_filterPExamples(_, _, [], [], [], _, _).
@@ -162,24 +148,22 @@
   ((Value=QConstant, PPos=[PExample|PPosTail], syn_iif_filterPExamples(PValence, QRValence, Examples, PPosTail, PNeg, QConstant, RConstant));
    (Value=RConstant, PNeg=[PExample|PNegTail], syn_iif_filterPExamples(PValence, QRValence, Examples, PPos, PNegTail, QConstant, RConstant))).
 
-
-
-% syn_foldr2(_, _, Q, ValenceQ, SubMaxHeight, [[as:[],b:W]]) :-
-%   syn(Q, foldr2, SubMaxHeight, ValenceQ, [[b:W]]).
-% syn_foldr2(P, ValenceP, Q, ValenceQ, SubMaxHeight, [[as:[],b:W]|Examples]) :-
-%   syn(Q, foldr2, SubMaxHeight, ValenceQ, [[b:W]]),
-%   syn_foldr2(P, ValenceP, Q, ValenceQ, SubMaxHeight, Examples).
-% syn_foldr2(P, ValenceP, Q, ValenceQ, SubMaxHeight, [[as:[X|T],b:W]|Examples]) :-
-%   syn_foldr2(P, ValenceP, Q, ValenceQ, SubMaxHeight, [[as:T,b:Z]|Examples]),
-%   syn(P, foldr2, SubMaxHeight, ValenceP, [[a:X,b:Z,ab:W]]).
-%
-% syn_foldr(_, _, _, _, _, []).
-% syn_foldr(P, ValP, Q, ValQ, SubMaxHeight, [[a0:A0, as:[], b:B]|ExRest]) :-
-%   syn(Q, foldr, SubMaxHeight, ValQ, [[a:A0, b:B]]),
-%   syn_foldr(P, ValP, Q, ValQ, SubMaxHeight, ExRest).
-% syn_foldr(P, ValP, Q, ValQ, SubMaxHeight, [[a0:A0, as:[A|As], b:AB]|ExRest]) :-
-%   syn_foldr(P, ValP, Q, ValQ, SubMaxHeight, [[a0:A0, as:As, b:B]|ExRest]),
-%   syn(P, foldr, SubMaxHeight, ValP, [[a:A, b:B, ab:AB]]).
+syn_foldr2(_, _, Q, ValenceQ, SubMaxHeight, [[as:[],b:W]]) :-
+  syn(Q, foldr2, SubMaxHeight, ValenceQ, [[b:W]]).
+syn_foldr2(P, ValenceP, Q, ValenceQ, SubMaxHeight, [[as:[],b:W]|Examples]) :-
+  syn(Q, foldr2, SubMaxHeight, ValenceQ, [[b:W]]),
+  syn_foldr2(P, ValenceP, Q, ValenceQ, SubMaxHeight, Examples).
+syn_foldr2(P, ValenceP, Q, ValenceQ, SubMaxHeight, [[as:[X|T],b:W]|Examples]) :-
+  syn_foldr2(P, ValenceP, Q, ValenceQ, SubMaxHeight, [[as:T,b:Z]|Examples]),
+  syn(P, foldr2, SubMaxHeight, ValenceP, [[a:X,b:Z,ab:W]]).
+
+syn_foldr(_, _, _, _, _, []).
+syn_foldr(P, ValP, Q, ValQ, SubMaxHeight, [[a0:A0, as:[], b:B]|ExRest]) :-
+  syn(Q, foldr, SubMaxHeight, ValQ, [[a:A0, b:B]]),
+  syn_foldr(P, ValP, Q, ValQ, SubMaxHeight, ExRest).
+syn_foldr(P, ValP, Q, ValQ, SubMaxHeight, [[a0:A0, as:[A|As], b:AB]|ExRest]) :-
+  syn_foldr(P, ValP, Q, ValQ, SubMaxHeight, [[a0:A0, as:As, b:B]|ExRest]),
+  syn(P, foldr, SubMaxHeight, ValP, [[a:A, b:B, ab:AB]]).
 
 testExamplesPos(_, []).
 testExamplesPos(P, [E|Er]) :- once(cnp(P, E)), testExamplesPos(P, Er).
@@ -268,14 +252,6 @@
   Nm is N-1,
   unifyFirstNInList(Nm, T1, T2).
 
-% firstNInList(0, _, []).
-% firstNInList(N, [], _) :- N>0, throw('There is not enough items in the lh list:' + N).
-% firstNInList(N, [Lh|Lt], L2) :-
-%   N>0,
-%   Nm1 is N-1,
-%   L2=[Lh|L2t],
-%   firstNInList(Nm1, Lt, L2t).
-
 makeUnboundList(0, []).
 makeUnboundList(N, [_|T]) :-
   N>0,
@@ -287,10 +263,3 @@
   N>0,
   Nm is N-1,
   repeatTermInList(Nm, E, Tail).
-%
-% repeatString(String, 1, RepeatedString) :- RepeatedString=String.
-% repeatString(String, N, RepeatedString) :-
-%   N>1,
-%   Nm is N-1,
-%   repeatString(String, Nm, RepeatedNm),
-%   string_concat(String, RepeatedNm, RepeatedString).
diff --git a/cnp/input_example0.pl b/cnp/input_example0.pl
diff --git a/cnp/loader.pl b/cnp/loader.pl
@@ -12,7 +12,6 @@
 
 :- consult('cnp.pl').
 :- consult('cnp_syn.pl').
-:- consult('cnp_lib.pl').
 
 
 

diff --git a/lights_examples.pl b/lights_examples.pl
@@ -1,7 +1,7 @@
 :- multifile jobValence/1.
 :- multifile jobConstant/1.
 :- multifile jobObservable/2.
-jobValence([rd:in, am:in, gr:in, dist:in, go:out]).
+jobValence([rd:in, dist:in, go:out]).
 %% Constants
 jobConstant(0.0).
 jobConstant(0.08).
@@ -12,15 +12,15 @@
 jobConstant(0.79).
 jobConstant(1.0).
 %% Observables
-jobObservable([rd:1.00, am:0.00, gr:0.00, dist:0.00, go:0.00], true).
-jobObservable([rd:1.00, am:0.00, gr:0.00, dist:0.59, go:0.00], true).
-jobObservable([rd:1.00, am:0.00, gr:0.00, dist:0.60, go:1.00], true).
-jobObservable([rd:1.00, am:0.00, gr:0.00, dist:1.00, go:1.00], true).
-jobObservable([rd:0.00, am:1.00, gr:0.00, dist:0.00, go:1.00], true).
-jobObservable([rd:0.00, am:1.00, gr:0.00, dist:0.08, go:1.00], true).
-jobObservable([rd:0.00, am:1.00, gr:0.00, dist:0.09, go:0.00], true).
-jobObservable([rd:0.00, am:1.00, gr:0.00, dist:0.78, go:0.00], true).
-jobObservable([rd:0.00, am:1.00, gr:0.00, dist:0.79, go:1.00], true).
-jobObservable([rd:0.00, am:1.00, gr:0.00, dist:1.00, go:1.00], true).
-jobObservable([rd:0.00, am:0.00, gr:1.00, dist:0.00, go:1.00], true).
-jobObservable([rd:0.00, am:0.00, gr:1.00, dist:1.00, go:1.00], true).
+jobObservable([rd:1.00, dist:0.00, go:0.00], true).
+jobObservable([rd:1.00, dist:0.59, go:0.00], true).
+jobObservable([rd:1.00, dist:0.60, go:1.00], true).
+jobObservable([rd:1.00, dist:1.00, go:1.00], true).
+% jobObservable([rd:0.00, am:1.00, gr:0.00, dist:0.00, go:1.00], true).
+% jobObservable([rd:0.00, am:1.00, gr:0.00, dist:0.08, go:1.00], true).
+% jobObservable([rd:0.00, am:1.00, gr:0.00, dist:0.09, go:0.00], true).
+% jobObservable([rd:0.00, am:1.00, gr:0.00, dist:0.78, go:0.00], true).
+% jobObservable([rd:0.00, am:1.00, gr:0.00, dist:0.79, go:1.00], true).
+% jobObservable([rd:0.00, am:1.00, gr:0.00, dist:1.00, go:1.00], true).
+% jobObservable([rd:0.00, am:0.00, gr:1.00, dist:0.00, go:1.00], true).
+% jobObservable([rd:0.00, am:0.00, gr:1.00, dist:1.00, go:1.00], true).