Examples of org.eclipse.jgit.diff.HistogramDiff$State

org.eclipse.jgit.diff.HistogramDiff
ohen.livejournal.com/73318.html">blog, and then was further extended to support low-occurrence common elements. The basic idea of the algorithm is to create a histogram of occurrences for each element of sequence A. Each element of sequence B is then considered in turn. If the element also exists in sequence A, and has a lower occurrence count, the positions are considered as a candidate for the longest common subsequence (LCS). After scanning of B is complete the LCS that has the lowest number of occurrences is chosen as a split point. The region is split around the LCS, and the algorithm is recursively applied to the sections before and after the LCS. By always selecting a LCS position with the lowest occurrence count, this algorithm behaves exactly like Bram Cohen's patience diff whenever there is a unique common element available between the two sequences. When no unique elements exist, the lowest occurrence element is chosen instead. This offers more readable diffs than simply falling back on the standard Myers' O(ND) algorithm would produce. To prevent the algorithm from having an O(N^2) running time, an upper limit on the number of unique elements in a histogram bucket is configured by {@link #setMaxChainLength(int)}. If sequence A has more than this many elements that hash into the same hash bucket, the algorithm passes the region to {@link #setFallbackAlgorithm(DiffAlgorithm)}. If no fallback algorithm is configured, the region is emitted as a replace edit. During scanning of sequence B, any element of A that occurs more than {@link #setMaxChainLength(int)} times is never considered for an LCS matchposition, even if it is common between the two sequences. This limits the number of locations in sequence A that must be considered to find the LCS, and helps maintain a lower running time bound. So long as {@link #setMaxChainLength(int)} is a small constant (such as 64),the algorithm runs in O(N * D) time, where N is the sum of the input lengths and D is the number of edits in the resulting EditList. If the supplied {@link SequenceComparator} has a good hash function, this implementationtypically out-performs {@link MyersDiff}, even though its theoretical running time is the same. This implementation has an internal limitation that prevents it from handling sequences with more than 268,435,456 (2^28) elements.

      if (RawText.isBinary(data2))
        return Collections.emptyList();
    } else
      data2 = new byte[0];


    return new HistogramDiff().diff(comparator, //
        data1.length > 0 ? new RawText(data1) : EMPTY_TEXT, //
        data2.length > 0 ? new RawText(data2) : EMPTY_TEXT);
  }

View Full Code Here

      if (RawText.isBinary(data2))
        return Collections.emptyList();
    } else
      data2 = new byte[0];


    return new HistogramDiff().diff(comparator, //
        data1.length > 0 ? new RawText(data1) : EMPTY_TEXT, //
        data2.length > 0 ? new RawText(data2) : EMPTY_TEXT);
  }

View Full Code Here

  /**
   * Creates a new MergeAlgorithm which uses {@link HistogramDiff} as diff
   * algorithm
   */
  public MergeAlgorithm() {
    this(new HistogramDiff());
  }

View Full Code Here

    private String getDiffinGitFormat(String string1, String string2) throws IOException {
        ByteArrayOutputStream out = new ByteArrayOutputStream();
        RawText rt1 = new RawText(string1.getBytes());
        RawText rt2 = new RawText(string2.getBytes());
        EditList diffList = new EditList();
        diffList.addAll(new HistogramDiff().diff(RawTextComparator.DEFAULT, rt1, rt2));
        new DiffFormatter(out).format(diffList, rt1, rt2);
        return out.toString();
    }

View Full Code Here

0 1

TOP

Related Classes of org.eclipse.jgit.diff.HistogramDiff$State

ariba.ui.aribaweb.core.AWComponent

ariba.ui.meta.core.Context

ariba.ui.meta.core.UIMeta

ca.eandb.jmist.framework.painter.UniformPainter

ca.eandb.jmist.framework.scene.RangeSceneElement

com.cburch.logisim.data.Value

com.github.jsonldjava.core.JsonLdError

com.google.collide.client.documentparser.DocumentParserWorker

com.google.gwt.dom.client.NativeEvent

com.google.gwt.user.client.Command

All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.