Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,20 @@ public void addDependency(CraftingJob craftingJob, int dependency) {
jobDependencies = new IntArrayList();
dependencies.put(craftingJob.getId(), jobDependencies);
}
jobDependencies.add(dependency);
// An edge is only stored once, as crafting interfaces add the edges of their jobs again when they re-register
if (!jobDependencies.contains(dependency)) {
jobDependencies.add(dependency);
}

// Save reverse link
IntCollection jobDependents = dependents.get(dependency);
if (jobDependents == null) {
jobDependents = new IntArrayList();
dependents.put(dependency, jobDependents);
}
jobDependents.add(craftingJob.getId());
if (!jobDependents.contains(craftingJob.getId())) {
jobDependents.add(craftingJob.getId());
}
}

public void removeDependency(int craftingJob, int dependency) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,23 @@ public void testSingleDependencyDouble() {
assertThat(Sets.newHashSet(g.getDependents(J1)), equalTo(Sets.newHashSet(J0)));
}

@Test
public void testSingleDependencyDoubleStoredOnce() {
g.addDependency(J0, J1);
g.addDependency(J0, J1.getId());
assertThat(Lists.newArrayList(g.getDependencies(J0)), equalTo(Lists.newArrayList(J1)));
assertThat(Lists.newArrayList(g.getDependents(J1)), equalTo(Lists.newArrayList(J0)));
}

@Test
public void testSingleDependencyDoubleRemove() {
g.addDependency(J0, J1);
g.addDependency(J0, J1);
g.removeDependency(0, 1);
assertThat(Sets.newHashSet(g.getCraftingJobs()), equalTo(Sets.newHashSet()));
assertThat(g.hasDependencies(J0), equalTo(false));
}

@Test
public void testSingleDependencyRemove() {
g.addDependency(J0, J1);
Expand Down
Loading