Skip to content

Commit ca4d2ef

Browse files
committed
1 parent 5d31b4a commit ca4d2ef

File tree

80 files changed

+89
-309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+89
-309
lines changed

DecisionSupport/src/alternative/AbstractAlternatives.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ private class ArrayIterator implements Iterator<T>
2121
private int index = 0;
2222

2323
/**
24-
* Checks if has next element.
24+
* Checks if it has next element.
2525
* @return true, if there is next element; false otherwise
2626
*/
2727
public boolean hasNext()

DecisionSupport/src/dmcontext/DMContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static class Params
4242

4343
/**
4444
* Normalization builder that will be used to generate normalization objects using the OSs (if null,
45-
* the standard linear builder will be used ({@link StandardLinearBuilder}).
45+
* the standard linear builder will be used ({@link StandardLinearBuilder})).
4646
*/
4747
public INormalizationBuilder _normalizationBuilder;
4848

DecisionSupport/src/inconsistency/IInconsistencyHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public interface IInconsistencyHandler<T extends AbstractInternalModel>
3535
/**
3636
* Signature for the method responsible for reintroducing consistency.
3737
*
38-
* @param report bundle result of the attempt to construct models (see {@link Report},
38+
* @param report bundle result of the attempt to construct models (see {@link Report}),
3939
* it is assumed that this bundle indicates inconsistency ({@link Report#_inconsistencyDetected}).
40-
* @param constructor object used to construct the model given the preference information stored in the history object {see {@link History}).
40+
* @param constructor object used to construct the model given the preference information stored in the history object (see {@link History}).
4141
* @param preferenceInformation current preference information (copied from the model system) that can be modified to reintroduce consistency (altered set should be stored in the report);
4242
* the list is derived via {@link History#getPreferenceInformationCopy()}, thus it is valid (e.g., preference statements are ordered from the oldest to the newest)
4343
* @return the method should reintroduce consistency (e.g., by altering the constructor definition or history

DecisionSupport/src/inconsistency/RemoveOldest.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,6 @@ public inconsistency.Report<T> reintroduceConsistency(Report<T> modelBundle,
6060
if (!modelBundle._inconsistencyDetected)
6161
throw new InconsistencyHandlerException("Called for inconsistency reintroduction, but the input model bundle reports consistency", this.getClass());
6262

63-
/*LinkedList<PreferenceInformationWrapper> copiedHistory;
64-
try
65-
{
66-
copiedHistory = history.getPreferenceInformationCopy();
67-
} catch (HistoryException e)
68-
{
69-
throw new InconsistencyHandlerException("Could not copy the preference elicitation history " + e.getDetailedReasonMessage(), this.getClass(), e);
70-
}*/
71-
7263
if (preferenceInformation.isEmpty())
7364
throw new InconsistencyHandlerException("The history of preference elicitation is empty (no reason to reintroduce consistency)", this.getClass());
7465

DecisionSupport/src/interaction/trigger/rules/IterationInterval.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ else if (_postponed > 0)
106106

107107
/**
108108
* A call-back method that can be used to inform the object that the interaction, although triggered, is postponed
109-
* (e.g., due to the unavailability of alternatives). This implementations increases the postponing counter.
109+
* (e.g., due to the unavailability of alternatives). This implementation increases the postponing counter.
110110
*
111111
* @param postpone object providing auxiliary data related to postponing (e.g., reason)
112112
*/

DecisionSupport/src/model/AbstractPreferenceModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public abstract class AbstractPreferenceModel<T extends IInternalModel> implemen
2424
protected final String _name;
2525

2626
/**
27-
* This array stores the internal models (extending {@link IInternalModel}.
27+
* This array stores the internal models (extending {@link IInternalModel}).
2828
*/
2929
protected ArrayList<T> _models;
3030

DecisionSupport/src/model/constructor/AbstractConstructor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ public Report<T> constructModels(LinkedList<PreferenceInformationWrapper> prefer
211211
}
212212

213213
/**
214-
* The pre-construct models phase. This default implementation creates the bundle and fills some some of its fields.
214+
* The pre-construct models phase. This default implementation creates the bundle and fills some of its fields.
215215
*
216216
* @param preferenceInformation the decision maker's preference information stored (provided via wrappers)
217217
* @return bundle result object to be filled

DecisionSupport/src/model/constructor/value/frs/FRS.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import model.constructor.random.IRandomModel;
1111
import model.internals.value.AbstractValueInternalModel;
1212
import random.IRandom;
13-
import space.normalization.builder.INormalizationBuilder;
14-
import space.normalization.builder.StandardLinearBuilder;
1513

1614
import java.util.ArrayList;
1715
import java.util.LinkedList;
@@ -37,12 +35,6 @@ public static class Params<T extends AbstractValueInternalModel>
3735
*/
3836
public final IRandomModel<T> _RM;
3937

40-
/**
41-
* Auxiliary normalization builder object that can be used to generate normalization objects.
42-
* By default, standard linear builder is used.
43-
*/
44-
public INormalizationBuilder _normalizationBuilder;
45-
4638
/**
4739
* Limit for the number of samples the FRS method is allowed to generate. Should be positive and greater (or equal)
4840
* than {@link Params#_feasibleSamplesToGenerate}. In the case of value violation, it is set to 1 or
@@ -82,7 +74,6 @@ public static class Params<T extends AbstractValueInternalModel>
8274
public Params(IRandomModel<T> RM)
8375
{
8476
_RM = RM;
85-
_normalizationBuilder = new StandardLinearBuilder();
8677
}
8778
}
8879

DecisionSupport/src/relation/IUnaryRelation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import alternative.Alternative;
44

55
/**
6-
* Interface for classes implementing the concept of an unary relation.
6+
* Interface for classes implementing the concept of a unary relation.
77
*
88
* @author MTomczyk
99
*/

DecisionSupport/src/system/modules/elicitation/PreferenceElicitationModule.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,7 @@ private boolean checkIfPreferenceInformationWasDerived(DMResult dmResult)
374374
{
375375
if (dmResult == null) return false;
376376
if (dmResult._feedback == null) return false;
377-
if (dmResult._feedback.isEmpty()) return false;
378-
return true;
377+
return !dmResult._feedback.isEmpty();
379378
}
380379

381380
/**

0 commit comments

Comments
 (0)