Projects >> goby >>2f93c68a96062a10dbc18eda4a136ee078790be7

Chunk
Conflicting content
     */
    private long timeStamp;

<<<<<<< HEAD
    /**
     * Specify the order (0 or 1) for modeling symbol dependencies.
     * @param order 1 (probability of a symbol depends on the previous symbol and the current symbol) 0 (only current symbol considered)
     */
    public void setSymbolDependencyOrder(int order) {
        this.encodeSymbolDependencyOrder = order;
    }

    /**
     * The number of previous symbols to consider when estimating a model probability.
     */
    private int encodeSymbolDependencyOrder = 0;
    private int decodeSymbolDependencyOrder;
=======
    private CoderType coderType;
>>>>>>> 91a23046e86e95b1c72c5ca5a2c52005c85e8cf9

    public boolean isEnableDomainOptimizations() {
        return enableDomainOptimizations;
Solution content
     */
    private long timeStamp;

    private CoderType coderType;

    public boolean isEnableDomainOptimizations() {
        return enableDomainOptimizations;
File
AlignmentCollectionHandler.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
Method declaration