Projects >> quickml >>984f7da8d4147efb8225b05134a53f264fd8f403

Chunk
Conflicting content 
package quickdt.crossValidation;

import com.google.common.base.Preconditions;
<<<<<<< HEAD
import com.google.common.base.Supplier;
import quickdt.data.AbstractInstance;
import quickdt.predictiveModels.PredictiveModel;
import sun.rmi.runtime.Log;
=======
>>>>>>> 8aefcc9c2d0ff948aef18110b976942c54eb6c97

import java.util.List;
Solution content 
package quickdt.crossValidation;

import com.google.common.base.Preconditions;
<<<<<<< HEAD
import com.google.common.base.Supplier;
import quickdt.data.AbstractInstance;
import quickdt.predictiveModels.PredictiveModel;
import sun.rmi.runtime.Log;
=======
>>>>>>> master

import java.util.List;
File
LogCrossValLoss.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
public class LogCrossValLoss extends OnlineCrossValLoss {


<<<<<<< HEAD
=======
    public static final double DEFAULT_MIN_PROBABILITY = 10e-8;
    double totalLogLoss = 0;
    private double total = 0;
>>>>>>> 8aefcc9c2d0ff948aef18110b976942c54eb6c97
    public  double minProbability;
    public  double maxError;
Solution content 
public class LogCrossValLoss extends OnlineCrossValLoss {

    public  double minProbability;
    public  double maxError;
File
LogCrossValLoss.java
Developer's decision
Version 1
Kind of conflict
Attribute