Results of semistructured (SM) and unstructured merge (UM) in revision : conflicts (C), conflicting lines of code (CL) and semantic conflicts (SC).
Yellow boxes indicate better results of unstructured merge. CM column dislays which kind is selected for combined conflict merge.
| C | CL | SC | CM |
|---|
| File | UM | SM | UM | SM | UM | SM |
|---|
| /source/org/jfree/chart/renderer/AbstractRenderer.java | 47 | 36 | 333 | 207 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/CategoryItemRenderer.java | 46 | 3 | 106 | 6 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java | 17 | 16 | 134 | 132 | -- | 0 | SM |
| /tests/org/jfree/chart/annotations/junit/XYBoxAnnotationTests.java | 15 | 14 | 135 | 124 | -- | 0 | SM |
| /source/org/jfree/chart/plot/PiePlot.java | 11 | 9 | 146 | 111 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java | 10 | 9 | 61 | 41 | -- | 0 | SM |
| /swt/org/jfree/experimental/chart/swt/ChartComposite.java | 10 | 8 | 620 | 446 | -- | 0 | SM |
| /source/org/jfree/chart/ChartPanel.java | 10 | 7 | 57 | 44 | -- | 2 | SM |
| /source/org/jfree/chart/renderer/xy/XYStepRenderer.java | 8 | 7 | 150 | 134 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/BoxAndWhiskerRenderer.java | 7 | 6 | 52 | 49 | -- | 0 | SM |
| /tests/org/jfree/chart/annotations/junit/XYDrawableAnnotationTests.java | 6 | 5 | 56 | 54 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/CandlestickRenderer.java | 6 | 2 | 38 | 8 | -- | 1 | SM |
| /source/org/jfree/chart/plot/ThermometerPlot.java | 4 | 3 | 28 | 9 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/xy/junit/YIntervalRendererTests.java | 4 | 3 | 16 | 14 | -- | 0 | SM |
| /tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java | 4 | 2 | 30 | 20 | -- | 0 | SM |
| /tests/org/jfree/data/time/junit/TimeSeriesTests.java | 3 | 2 | 123 | 66 | -- | 0 | SM |
| /source/org/jfree/chart/plot/CombinedDomainCategoryPlot.java | 3 | 2 | 26 | 18 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/LevelRenderer.java | 3 | 2 | 23 | 12 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/MinMaxCategoryRenderer.java | 3 | 2 | 18 | 16 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/WaterfallBarRenderer.java | 3 | 1 | 73 | 62 | -- | 0 | SM |
| /source/org/jfree/chart/plot/CombinedRangeXYPlot.java | 3 | 1 | 19 | 12 | -- | 0 | SM |
| /source/org/jfree/chart/plot/CombinedDomainXYPlot.java | 3 | 1 | 19 | 12 | -- | 0 | SM |
| /experimental/org/jfree/experimental/chart/annotations/XYTitleAnnotation.java | 2 | 1 | 28 | 26 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/XYDotRenderer.java | 2 | 1 | 24 | 14 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/HighLowRenderer.java | 2 | 1 | 21 | 15 | -- | 0 | SM |
| /source/org/jfree/chart/plot/Plot.java | 3 | 0 | 27 | 0 | -- | 4 | SM |
| /source/org/jfree/chart/plot/CombinedRangeCategoryPlot.java | 2 | 1 | 15 | 12 | -- | 0 | SM |
| /source/org/jfree/chart/block/EmptyBlock.java | 2 | 1 | 13 | 9 | -- | 0 | SM |
| /source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java | 3 | 0 | 15 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/JFreeChart.java | 2 | 1 | 7 | 4 | -- | 1 | SM |
| /tests/org/jfree/chart/renderer/xy/junit/StandardXYItemRendererTests.java | 2 | 1 | 6 | 4 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/xy/junit/XYBlockRendererTests.java | 2 | 1 | 7 | 2 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/YIntervalRenderer.java | 2 | 0 | 38 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/StandardDialScale.java | 1 | 0 | 832 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/DialValueIndicator.java | 1 | 0 | 599 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/DialPointer.java | 1 | 0 | 552 | 0 | -- | 0 | SM |
| /tests/org/jfree/chart/axis/junit/LogAxisTests.java | 1 | 0 | 412 | 0 | -- | 0 | SM |
| /source/org/jfree/data/statistics/DefaultMultiValueCategoryDataset.java | 1 | 0 | 366 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/StandardDialRange.java | 1 | 0 | 357 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/DialTextAnnotation.java | 1 | 0 | 325 | 0 | -- | 0 | SM |
| /tests/org/jfree/chart/plot/dial/junit/DialValueIndicatorTests.java | 1 | 0 | 272 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/DialCap.java | 1 | 0 | 261 | 0 | -- | 0 | SM |
| /tests/org/jfree/chart/plot/dial/junit/DialBackgroundTests.java | 1 | 0 | 244 | 0 | -- | 0 | SM |
| /tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java | 1 | 0 | 164 | 0 | -- | 0 | SM |
| /tests/org/jfree/chart/urls/junit/CustomPieURLGeneratorTests.java | 1 | 0 | 151 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/AbstractDialLayer.java | 1 | 0 | 128 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/editor/DefaultColorBarEditor.java | 1 | 0 | 111 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/encoders/KeypointPNGEncoderAdapter.java | 1 | 0 | 41 | 0 | -- | 0 | SM |
| /source/org/jfree/data/statistics/MultiValueCategoryDataset.java | 1 | 0 | 14 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/title/ImageTitle.java | 1 | 0 | 11 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/editor/DefaultTitleEditor.java | 1 | 0 | 8 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/needle/MeterNeedle.java | 1 | 0 | 7 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/LegendItem.java | 1 | 0 | 7 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/block/ColorBlock.java | 1 | 0 | 6 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/DeviationRenderer.java | 1 | 0 | 5 | 0 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
| /source/org/jfree/data/statistics/DefaultBoxAndWhiskerCategoryDataset.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
| /source/org/jfree/data/DefaultKeyedValues.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/labels/StandardPieToolTipGenerator.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/xy/junit/XYBarRendererTests.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /tests/org/jfree/chart/annotations/junit/XYTextAnnotationTests.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /tests/org/jfree/chart/annotations/junit/XYImageAnnotationTests.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /source/org/jfree/data/xy/XYSeries.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /source/org/jfree/data/xy/MatrixSeriesCollection.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /source/org/jfree/data/statistics/DefaultStatisticalCategoryDataset.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/labels/MultipleXYSeriesLabelGenerator.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/labels/HighLowItemLabelGenerator.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/labels/AbstractCategoryItemLabelGenerator.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /source/org/jfree/data/xy/YIntervalSeriesCollection.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
| /source/org/jfree/data/xy/XYSeriesCollection.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
| /source/org/jfree/data/xy/XYIntervalSeriesCollection.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
| /source/org/jfree/data/xy/XIntervalSeriesCollection.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
| /source/org/jfree/data/xy/VectorSeriesCollection.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
| /source/org/jfree/data/xy/DefaultTableXYDataset.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/labels/BubbleXYItemLabelGenerator.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/labels/AbstractXYItemLabelGenerator.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/entity/ChartEntity.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/resources/JFreeChartResources.java | 1 | 0 | 2 | 0 | -- | 1 | SM |
| /source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java | 12 | 12 | 63 | 61 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java | 9 | 9 | 65 | 46 | -- | 0 | SM |
| /swt/org/jfree/experimental/chart/swt/editor/SWTAxisEditor.java | 7 | 7 | 48 | 48 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/category/junit/LineAndShapeRendererTests.java | 5 | 5 | 57 | 57 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/LayeredBarRenderer.java | 4 | 4 | 48 | 48 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/StackedBarRenderer3D.java | 4 | 4 | 17 | 17 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/xy/junit/XYLineAndShapeRendererTests.java | 4 | 4 | 14 | 14 | -- | 0 | SM |
| /source/org/jfree/chart/plot/CompassPlot.java | 4 | 4 | 8 | 8 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java | 3 | 3 | 54 | 54 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/XYBlockRenderer.java | 3 | 3 | 36 | 36 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/category/junit/LineRenderer3DTests.java | 3 | 3 | 27 | 27 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/GanttRenderer.java | 2 | 2 | 37 | 37 | -- | 0 | SM |
| /tests/org/jfree/data/xy/junit/YIntervalSeriesTests.java | 2 | 2 | 36 | 30 | -- | 0 | SM |
| /tests/org/jfree/data/xy/junit/XYIntervalSeriesTests.java | 2 | 2 | 36 | 30 | -- | 0 | SM |
| /tests/org/jfree/data/time/ohlc/junit/OHLCSeriesTests.java | 2 | 2 | 36 | 30 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/xy/junit/CandlestickRendererTests.java | 2 | 2 | 28 | 26 | -- | 0 | SM |
| /tests/org/jfree/data/time/junit/WeekTests.java | 2 | 2 | 24 | 24 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/xy/junit/ClusteredXYBarRendererTests.java | 2 | 2 | 8 | 8 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/category/junit/StackedBarRenderer3DTests.java | 2 | 2 | 6 | 6 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/DialPlot.java | 1 | 1 | 774 | 124 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/StandardDialFrame.java | 1 | 1 | 295 | 16 | -- | 0 | SM |
| /source/org/jfree/chart/ChartFactory.java | 1 | 1 | 138 | 138 | -- | 0 | SM |
| /source/org/jfree/chart/HashUtilities.java | 1 | 1 | 128 | 18 | -- | 0 | SM |
| /tests/org/jfree/chart/urls/junit/CustomXYURLGeneratorTests.java | 1 | 1 | 84 | 46 | -- | 0 | SM |
| /experimental/org/jfree/experimental/chart/annotations/junit/XYTitleAnnotationTests.java | 1 | 1 | 64 | 64 | -- | 0 | SM |
| /tests/org/jfree/data/category/junit/DefaultCategoryDatasetTests.java | 1 | 1 | 70 | 16 | -- | 0 | SM |
| /tests/org/jfree/data/junit/DefaultKeyedValues2DTests.java | 1 | 1 | 32 | 32 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/category/junit/MinMaxCategoryRendererTests.java | 1 | 1 | 28 | 28 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/VectorRenderer.java | 1 | 1 | 24 | 24 | -- | 0 | SM |
| /source/org/jfree/chart/urls/StandardCategoryURLGenerator.java | 1 | 1 | 21 | 21 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/XYBoxAndWhiskerRenderer.java | 1 | 1 | 20 | 18 | -- | 0 | SM |
| /tests/org/jfree/chart/junit/HashUtilitiesTests.java | 1 | 1 | 23 | 10 | -- | 0 | SM |
| /tests/org/jfree/data/junit/DefaultKeyedValuesTests.java | 1 | 1 | 16 | 16 | -- | 0 | SM |
| /swt/org/jfree/experimental/chart/swt/editor/SWTTitleEditor.java | 1 | 1 | 14 | 14 | -- | 0 | SM |
| /swt/org/jfree/experimental/chart/swt/editor/SWTNumberAxisEditor.java | 1 | 1 | 13 | 13 | -- | 0 | SM |
| /tests/org/jfree/data/time/junit/TimePeriodValuesCollectionTests.java | 1 | 1 | 12 | 12 | -- | 0 | SM |
| /swt/org/jfree/experimental/chart/swt/editor/SWTPlotAppearanceEditor.java | 1 | 1 | 12 | 12 | -- | 0 | SM |
| /source/org/jfree/data/DefaultKeyedValues2D.java | 1 | 1 | 12 | 12 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/xy/junit/XYDotRendererTests.java | 1 | 1 | 8 | 8 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/xy/junit/XYBoxAndWhiskerRendererTests.java | 1 | 1 | 8 | 8 | -- | 0 | SM |
| /swt/org/jfree/experimental/chart/swt/editor/SWTChartEditor.java | 1 | 1 | 8 | 8 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/LineRenderer3D.java | 1 | 1 | 8 | 8 | -- | 0 | SM |
| /tests/org/jfree/data/xy/junit/VectorSeriesTests.java | 1 | 1 | 8 | 6 | -- | 0 | SM |
| /source/org/jfree/data/DefaultKeyedValue.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/XYStepAreaRenderer.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/XYAreaRenderer.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/BarRenderer3D.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
| /source/org/jfree/chart/imagemap/ImageMapUtilities.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
| /tests/org/jfree/chart/util/junit/UtilPackageTests.java | 1 | 1 | 5 | 5 | -- | 0 | SM |
| /swt/org/jfree/experimental/chart/swt/demo/SWTPieChartDemo1.java | 1 | 1 | 5 | 5 | -- | 0 | SM |
| /source/org/jfree/chart/editor/DefaultPlotEditor.java | 1 | 1 | 5 | 5 | -- | 0 | SM |
| /source/org/jfree/data/time/Week.java | 1 | 1 | 6 | 2 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/BarRenderer.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
| /source/org/jfree/chart/plot/PieLabelDistributor.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
| /source/org/jfree/chart/block/BorderArrangement.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
| /tests/org/jfree/chart/urls/junit/UrlsPackageTests.java | 1 | 1 | 3 | 3 | -- | 0 | SM |
| /source/org/jfree/chart/axis/PeriodAxisLabelInfo.java | 1 | 1 | 3 | 3 | -- | 0 | SM |
| /tests/org/jfree/data/statistics/junit/DataStatisticsPackageTests.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/xy/junit/RendererXYPackageTests.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /tests/org/jfree/chart/entity/junit/EntityPackageTests.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /source/org/jfree/chart/plot/WaferMapPlot.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /source/org/jfree/chart/demo/PieChartDemo1.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /tests/org/jfree/data/xy/junit/XYSeriesCollectionTests.java | 0 | 1 | 0 | 44 | -- | 0 | UM |
| /tests/org/jfree/data/general/junit/DatasetUtilitiesTests.java | 1 | 1 | 1 | 6 | -- | 0 | UM |
| /source/org/jfree/chart/annotations/CategoryTextAnnotation.java | 1 | 1 | 3 | 31 | -- | 0 | UM |
| /source/org/jfree/chart/annotations/CategoryLineAnnotation.java | 1 | 1 | 5 | 39 | -- | 0 | UM |
| /source/org/jfree/chart/axis/ValueAxis.java | 1 | 1 | 3 | 72 | -- | 0 | UM |
| /tests/org/jfree/chart/plot/junit/XYPlotTests.java | 1 | 2 | 16 | 16 | -- | 0 | UM |
| /tests/org/jfree/chart/renderer/xy/junit/XYStepRendererTests.java | 1 | 2 | 16 | 76 | -- | 0 | UM |
| /source/org/jfree/chart/plot/dial/DialBackground.java | 1 | 2 | 198 | 33 | -- | 0 | UM |
| /source/org/jfree/chart/util/LogFormat.java | 1 | 2 | 166 | 72 | -- | 0 | UM |
| /tests/org/jfree/chart/renderer/category/junit/ScatterRendererTests.java | 1 | 3 | 229 | 134 | -- | 0 | UM |
| /source/org/jfree/chart/plot/dial/ArcDialFrame.java | 1 | 3 | 453 | 106 | -- | 0 | UM |
| /tests/org/jfree/chart/plot/junit/CategoryPlotTests.java | 0 | 5 | 0 | 105 | -- | 0 | UM |
| /tests/org/jfree/data/xy/junit/XYSeriesTests.java | 2 | 3 | 110 | 110 | -- | 0 | UM |
| /source/org/jfree/chart/axis/LogAxis.java | 1 | 4 | 964 | 254 | -- | 0 | UM |
| /tests/org/jfree/chart/renderer/category/junit/StatisticalBarRendererTests.java | 1 | 5 | 4 | 176 | -- | 0 | UM |
| /tests/org/jfree/data/xy/junit/XIntervalSeriesTests.java | 3 | 4 | 64 | 58 | -- | 0 | UM |
| /source/org/jfree/chart/axis/CategoryAxis.java | 4 | 4 | 41 | 57 | -- | 0 | UM |
| /source/org/jfree/data/general/DatasetUtilities.java | 4 | 4 | 39 | 201 | -- | 0 | UM |
| /tests/org/jfree/chart/renderer/category/junit/BoxAndWhiskerRendererTests.java | 1 | 8 | 322 | 368 | -- | 0 | UM |
| /source/org/jfree/data/time/TimeSeries.java | 5 | 5 | 46 | 72 | -- | 0 | UM |
| /swt/org/jfree/experimental/swt/SWTGraphics2D.java | 5 | 5 | 62 | 66 | -- | 0 | UM |
| /source/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java | 6 | 7 | 30 | 20 | -- | 0 | UM |
| /source/org/jfree/chart/renderer/category/ScatterRenderer.java | 1 | 12 | 504 | 297 | -- | 0 | UM |
| /tests/org/jfree/data/category/junit/DefaultIntervalCategoryDatasetTests.java | 3 | 14 | 220 | 220 | -- | 0 | UM |
| /source/org/jfree/chart/plot/PolarPlot.java | 9 | 9 | 60 | 80 | -- | 0 | UM |
| /source/org/jfree/chart/plot/ContourPlot.java | 1 | 21 | 893 | 126 | -- | 0 | UM |
| /source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java | 12 | 12 | 174 | 184 | -- | 0 | UM |
| /source/org/jfree/chart/plot/CategoryPlot.java | 13 | 13 | 202 | 295 | -- | 4 | UM |
| /source/org/jfree/chart/plot/XYPlot.java | 19 | 22 | 249 | 357 | -- | 0 | UM |