Projects >> blog >>5e7f144e968b0f2181e20e4eab65a5ab31cca30a

Chunk
Conflicting content 
public class Clause {

  /**
<<<<<<< HEAD
   * Creates a new clause.
   * 
   * @param cond
   *          the condition under which this clause applies
   * @param cpdClass
   *          the class of the conditional probability distribution used in this
   *          clause
   * @param cpdParams
   *          List of ArgSpec objects representing CPD parameters. These must be
   *          non-random and must contain no free variables.
   * @param cpdArgs
   *          List of ArgSpec objects whose denotations will be passed to the
   *          CPD each time it is invoked
   */
  public Clause(Formula cond, Class cpdClass,
      List cpdParams, List cpdArgs) {
    this.cond = cond;
    this.cpdClass = cpdClass;
    this.cpdParams = cpdParams;
    this.cpd = null;
    this.cpdArgs = cpdArgs;
    this.cpdArgsAndParams = null;
  }

  /**
   * Create a new clause where it is not yet known which fields are
   * parameters and which are arguments.
=======
   * Create a new clause.
>>>>>>> 6f4ec39822b7064f2ec5cb521b501816af92bb26
   * 
   * @param cond
   *          the condition under which this clause applies
Solution content 
public class Clause {

  /**
   * Create a new clause.
   * 
   * @param cond
   *          the condition under which this clause applies
File
Clause.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
   *          the condition under which this clause applies
   * @param cpdCLass
   *          the class of the conditional probability distribution used.
<<<<<<< HEAD
   * @param cpdArgsAndParams
   *          A mixed list of arguments and parameters.
   */
  public Clause(Formula cond, Class cpdClass,
      List cpdArgsAndParams) {
    this.cond = cond;
    this.cpdClass = cpdClass;
    this.cpdParams = null;
    this.cpdArgs = null;
    this.cpdArgsAndParams = cpdArgsAndParams;
  }

  /**
   * Creates a new clause using the given CondProbDistrib object.
   * 
   * @param cond
   *          the condition under which this clause applies
   * @param cpd
   *          conditional probability distribution for this clause
=======
>>>>>>> 6f4ec39822b7064f2ec5cb521b501816af92bb26
   * @param cpdArgs
   *          A list of arguments (may be fixed or non-fixed).
   */
Solution content 
   *          the condition under which this clause applies
   * @param cpdCLass
   *          the class of the conditional probability distribution used.
   * @param cpdArgs
   *          A list of arguments (may be fixed or non-fixed).
   */
File
Clause.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
  private Formula cond;
  private Class cpdClass;
<<<<<<< HEAD
  private List cpdParams; // of ArgSpec;
=======
>>>>>>> 6f4ec39822b7064f2ec5cb521b501816af92bb26
  private CondProbDistrib cpd;
  private List cpdArgs;
}
Solution content 
  private Formula cond;
  private Class cpdClass;
  private CondProbDistrib cpd;
  private List cpdArgs;
}
File
Clause.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment