From: Caspar Safarlou Date: Mon, 17 Nov 2014 21:29:03 +0000 (+0100) Subject: added underscores where usefull and deleted useless brackets X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=11c28ca9253cf3300104d503f3545b5e37e168e4;p=ker1415-1.git added underscores where usefull and deleted useless brackets --- diff --git a/report/src/task14.pl b/report/src/task14.pl index 3cc3aa2..5e89e10 100644 --- a/report/src/task14.pl +++ b/report/src/task14.pl @@ -1,23 +1,18 @@ :- [diagnosis]. - -generateHittingSetTree(SD, COMP, OBS, HS, T) :- %test with problem1(SD,COMP,OBS), generateHittingSetTree(SD,COMP,OBS,[],T). This needs to report node([a1], [node([a2], [leaf])]). - ( - tp(SD, COMP, OBS, HS, CS) -> %finds a conflict set - generateParts(SD, COMP, OBS, HS, [], T) ; generateParts(SD, COMP, OBS, HS, CS, T) %first part of the OR is needed to translate an empty conflict set into a leaf. - ). - -generateParts(SD, COMP, OBS, HS, [],leaf).%generates leaf if at the end of all possible conflict sets in a branch -generateParts(SD, COMP, OBS, HS, CS, node(CS, TS)) :- %generates node if the conflict set isn't empty and goes on. - repairBranch(SD, COMP, OBS, HS, CS, TS). %repairs the branch by branching out for each item in the conflict set +generateHittingSetTree(SD, COMP, OBS, HS, HSTREE) :- %test with problem1(SD,COMP,OBS), generateHittingSetTree(SD,COMP,OBS,[],T). This needs to report node([a1], [node([a2], [leaf])]). + tp(SD, COMP, OBS, HS, CS) -> generateParts(SD, COMP, OBS, HS, CS, HSTREE) ; generateParts(_, _, _, _, [], HSTREE). %second part of the OR is needed to translate an empty conflict set into a leaf. + +generateParts(_,_,_,_, [],leaf).%generates leaf if at the end of all possible conflict sets in a branch +generateParts(SD, COMP, OBS, HS, CS, node(CS, RESTOFTREE)) :- %generates node if the conflict set isn't empty and goes on. + repairBranch(SD, COMP, OBS, HS, CS, RESTOFTREE). %repairs the branch by branching out for each item in the conflict set and generating new conflict sets for the next node repairBranch(SD, COMP, OBS, HS, [CS], [X]) :- %single item left in conflict set append(HS, [CS], HSNEW), %add the used conflict set item for this branch to the new hitting set generateHittingSetTree(SD, COMP, OBS, HSNEW, X). %find the next new conflict set with the new hitted item - repairBranch(SD, COMP, OBS, HS, [CSHEAD|CSTAIL], [X|Xs]) :- %multiple items left in conflict set append(HS, [CSHEAD], HSNEW), %add the used conflict set item for this branch to the new hitting set generateHittingSetTree(SD, COMP, OBS, HSNEW, X), %find the next new conflict set with the new hitted item repairBranch(SD, COMP, OBS, HS, CSTAIL, Xs). %goes on in recursion for each item in the conflict set of the current node - \ No newline at end of file + \ No newline at end of file