Projects >> LUScheduling >>f5a564ec120da151c848c08c151cec4f8f365dae

Chunk
Conflicting content 
package org.learningu.scheduling.graph;

<<<<<<< HEAD
import org.learningu.scheduling.flags.Flag;
=======
import com.google.inject.Inject;
import com.google.inject.name.Named;
>>>>>>> 69b9ab4540ed7f16d8c3e2ce3c5a6f0dce6a96c9

import org.learningu.scheduling.annotations.Flag;
Solution content 
package org.learningu.scheduling.graph;

import org.learningu.scheduling.flags.Flag;
File
ProgramCacheFlags.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
 * @author lowasser
 */
public final class ProgramCacheFlags {
<<<<<<< HEAD
=======

  public static final ProgramCacheFlags DEFAULTS = new ProgramCacheFlags(1000, 10000, 10000,
      10000, 10000, 10000, 10000, 4);

  @Flag(
      value = "prerequisiteCacheSize",
      description = "Maximum cache size to use for prerequisites",
      defaultValue = "1000")
  final int prerequisiteCacheSize;

>>>>>>> 69b9ab4540ed7f16d8c3e2ce3c5a6f0dce6a96c9
  @Flag(
      name = "teacherAvailableCacheSize",
      description = "Maximum cache size to use for teacher available blocks")
Solution content 
 * @author lowasser
 */
public final class ProgramCacheFlags {
  @Flag(
      name = "teacherAvailableCacheSize",
      description = "Maximum cache size to use for teacher available blocks")
File
ProgramCacheFlags.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Method invocation
Chunk
Conflicting content 
<<<<<<< HEAD
  int roomPropsCacheSize = 10000;

  @Flag(
      name = "programCacheConcurrencyLevel",
      description = "Number of concurrent updates allowed in caches for the Program")
  int cacheConcurrencyLevel = 4;
=======
      value = "programCacheConcurrencyLevel",
      description = "Number of concurrent updates allowed in caches for the Program",
      defaultValue = "4")
  final int cacheConcurrencyLevel;

  @Inject
  ProgramCacheFlags(
      @Named("prerequisiteCacheSize") int prerequisiteCacheSize,
      @Named("teacherAvailableCacheSize") int teacherAvailableCacheSize,
      @Named("roomAvailableCacheSize") int roomAvailableCacheSize,
      @Named("courseCompatibleCacheSize") int courseCompatibleCacheSize,
      @Named("courseTeachersCacheSize") int courseTeachersCacheSize,
      @Named("roomPropsCacheSize") int roomPropsCacheSize,
      @Named("reqPropsCacheSize") int reqPropsCacheSize,
      @Named("programCacheConcurrencyLevel") int cacheConcurrencyLevel) {
    this.prerequisiteCacheSize = prerequisiteCacheSize;
    this.teacherAvailableCacheSize = teacherAvailableCacheSize;
    this.roomAvailableCacheSize = roomAvailableCacheSize;
    this.courseCompatibleCacheSize = courseCompatibleCacheSize;
    this.courseTeachersCacheSize = courseTeachersCacheSize;
    this.roomPropsCacheSize = roomPropsCacheSize;
    this.reqPropsCacheSize = reqPropsCacheSize;
    this.cacheConcurrencyLevel = cacheConcurrencyLevel;
  }
>>>>>>> 69b9ab4540ed7f16d8c3e2ce3c5a6f0dce6a96c9
}
Solution content 
  int roomPropsCacheSize = 10000;

  @Flag(
      name = "programCacheConcurrencyLevel",
      description = "Number of concurrent updates allowed in caches for the Program")
  int cacheConcurrencyLevel = 4;
}
File
ProgramCacheFlags.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Method declaration