Projects >> gitools >>32413409c197f241f78e5c2ff2b974a23c55baf3

Chunk
Conflicting content 
 */
package org.gitools.analysis.groupcomparison;

<<<<<<< HEAD
import org.gitools.analysis.Analysis;
import org.gitools.analysis.ToolConfig;
import org.gitools.analysis.groupcomparison.DimensionGroups.DimensionGroup;
import org.gitools.analysis.groupcomparison.DimensionGroups.DimensionGroupEnum;
=======
>>>>>>> cc4e88869e24e940f491b14602697fc31578b7ad
import org.gitools.analysis.stats.test.Test;
import org.gitools.analysis.stats.test.factory.TestFactory;
import org.gitools.api.matrix.IAnnotations;
Solution content 
 */
package org.gitools.analysis.groupcomparison;

import org.gitools.analysis.stats.test.Test;
import org.gitools.analysis.stats.test.factory.TestFactory;
import org.gitools.api.matrix.IAnnotations;
File
GroupComparisonAnalysis.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    private Double nullConversion;


<<<<<<< HEAD
    public String mtc() {
=======
    public String getMtc() {
>>>>>>> cc4e88869e24e940f491b14602697fc31578b7ad
        return mtc;
    }
Solution content 

    public String getMtc() {
        return mtc;
    }
File
GroupComparisonAnalysis.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
package org.gitools.analysis.groupcomparison;

import org.gitools.analysis.AnalysisException;
<<<<<<< HEAD
import org.gitools.analysis.groupcomparison.DimensionGroups.DimensionGroup;
import org.gitools.analysis.htest.MtcTestProcessor;
=======
import org.gitools.analysis.AnalysisProcessor;
import org.gitools.analysis.groupcomparison.filters.GroupByLabelPredicate;
import org.gitools.analysis.groupcomparison.filters.GroupByValuePredicate;
import org.gitools.analysis.stats.mtc.MTCFactory;
>>>>>>> cc4e88869e24e940f491b14602697fc31578b7ad
import org.gitools.analysis.stats.test.MannWhitneyWilxoxonTest;
import org.gitools.analysis.stats.test.results.GroupComparisonResult;
import org.gitools.api.analysis.IProgressMonitor;
Solution content 
package org.gitools.analysis.groupcomparison;

import org.gitools.analysis.AnalysisException;
import org.gitools.analysis.groupcomparison.DimensionGroups.DimensionGroup;
import org.gitools.analysis.htest.MtcTestProcessor;
import org.gitools.analysis.stats.test.MannWhitneyWilxoxonTest;
import org.gitools.analysis.stats.test.results.GroupComparisonResult;
import org.gitools.api.analysis.IProgressMonitor;
File
GroupComparisonProcessor.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.Arrays;
import java.util.Date;

<<<<<<< HEAD
import static org.gitools.analysis.stats.mtc.MTCFactory.createFromName;
import static org.gitools.analysis.stats.mtc.MTCFactory.createFunction;
import static org.gitools.api.matrix.MatrixDimensionKey.COLUMNS;
import static org.gitools.api.matrix.MatrixDimensionKey.ROWS;

public class GroupComparisonProcessor extends MtcTestProcessor {
=======
public class GroupComparisonProcessor implements AnalysisProcessor {
>>>>>>> cc4e88869e24e940f491b14602697fc31578b7ad

    private final GroupComparisonAnalysis analysis;
Solution content 
import java.util.Arrays;
import java.util.Date;

import static org.gitools.analysis.stats.mtc.MTCFactory.createFromName;
import static org.gitools.analysis.stats.mtc.MTCFactory.createFunction;
import static org.gitools.api.matrix.MatrixDimensionKey.COLUMNS;
import static org.gitools.api.matrix.MatrixDimensionKey.ROWS;

public class GroupComparisonProcessor extends MtcTestProcessor {

    private final GroupComparisonAnalysis analysis;
File
GroupComparisonProcessor.java
Developer's decision
Version 1
Kind of conflict
Class signature
Import
Chunk
Conflicting content 
        context.put("dataFile", fileRef != null ? fileRef.getName() : "Not defined");

<<<<<<< HEAD
        context.put("mtc", analysis.mtc());
=======
        context.put("mtc", analysis.getMtc());
>>>>>>> cc4e88869e24e940f491b14602697fc31578b7ad

        fileRef = analysis.getResults().getLocator();
        context.put("resultsFile", fileRef != null ? fileRef.getName() : "Not defined");
Solution content 
        context.put("dataFile", fileRef != null ? fileRef.getName() : "Not defined");

        context.put("mtc", analysis.getMtc());

        fileRef = analysis.getResults().getLocator();
        context.put("resultsFile", fileRef != null ? fileRef.getName() : "Not defined");
File
GroupComparisonAnalysisEditor.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        a.setLayer(groupingPage.getLayer());
        a.setNullConversion(groupingPage.getNullConversion());
        a.setToolConfig(toolConfig);
<<<<<<< HEAD
        a.setMtc(statisticsPage.getMtc().getShortName());
=======
        a.setMtc(attrSelectPage.getMtc());
>>>>>>> cc4e88869e24e940f491b14602697fc31578b7ad
        a.setRowAnnotations(heatmap.getRows().getAnnotations());

        List rowHeaders = new ArrayList<>();
Solution content 
        a.setToolConfig(toolConfig);
        a.setMtc(attrSelectPage.getMtc());
        a.setRowAnnotations(heatmap.getRows().getAnnotations());

        List rowHeaders = new ArrayList<>();
File
GroupComparisonAnalysisFromEditorWizard.java
Developer's decision
Version 2
Kind of conflict
Other