Projects >> CS-M41-Programming-in-Java >>dee3de3e4ad41d7d2c5fa4216e5654138c50345b

Chunk
Conflicting content 
      for (int p = 0; p < rows[r].length; ++p) {
        final int i = rows[r][p][0];
        final int j = rows[r][p][1];
<<<<<<< HEAD
        occ[i][j][ curr_index[i][j]++ ] = r;
=======
        // XXX to be completed (one single line) XXX
>>>>>>> 89280ae0f831cabd2dfd40bb2fe68381ed245172
      }
    // resizing the occurrence-arrays to the actual lengths:
    for (int i = 0; i < M; ++i)
Solution content 
        final int i = rows[r][p][0];
        final int j = rows[r][p][1];
      for (int p = 0; p < rows[r].length; ++p) {
        occ[i][j][ curr_index[i][j]++ ] = r;
      }
    // resizing the occurrence-arrays to the actual lengths:
    for (int i = 0; i < M; ++i)
File
Occurrences.java
Developer's decision
Version 1
Kind of conflict
Array access
Comment
Variable
Chunk
Conflicting content 
  }


  public static void show_occurrence_counts(final int[][][] occurrences) {
    assert(occurrences != null);
<<<<<<< HEAD
    final int M = occurrences.length;
    assert(M != 0);
    final int N = occurrences[0].length;
    assert(N != 0);
    final int spaces = (M*N <= 99) ? 3 : 4;
    for (int i = 0; i < M; ++i) {
      for (int j = 0; j < N; ++j) {
        assert(occurrences[i][j] != null);
        final int count = occurrences[i][j].length;
        StdOut.printf("%" + spaces + "d", count);
      }
      System.out.println();
    }
=======
    // XXX to be completed XXX
>>>>>>> 89280ae0f831cabd2dfd40bb2fe68381ed245172
Solution content 
  public static void show_occurrence_counts(final int[][][] occurrences) {
    assert(occurrences != null);
    final int M = occurrences.length;
    assert(M != 0);
    final int N = occurrences[0].length;
    assert(N != 0);
    final int spaces = (M*N <= 99) ? 3 : 4;
    for (int i = 0; i < M; ++i) {
      for (int j = 0; j < N; ++j) {
        assert(occurrences[i][j] != null);
        final int count = occurrences[i][j].length;
        StdOut.printf("%" + spaces + "d", count);
      }
      System.out.println();
    }
  }
File
Occurrences.java
Developer's decision
Version 1
Kind of conflict
Array access
Assert statement
Comment
For statement
Variable