agp8x
/
satisfactory
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

reformat & code cleanup

master
clemens 2022-07-05 15:23:05 +02:00
parent 6bb38066d6
commit ea30ec2b6b
21 changed files with 192 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@ -10,13 +10,13 @@ repositories {
} }
dependencies { dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.2' implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
implementation 'org.jgrapht:jgrapht-io:1.5.1' implementation 'org.jgrapht:jgrapht-io:1.5.1'
implementation 'guru.nidi:graphviz-java:0.18.1' implementation 'guru.nidi:graphviz-java:0.18.1'
implementation 'org.graalvm.js:js:20.0.0' implementation 'org.graalvm.js:js:22.1.0.1'
implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.13.0' implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.2'
} }
test { test {

6
src/main/java/satisfactory/Test.java
View File

@ -3,8 +3,6 @@ package satisfactory;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import guru.nidi.graphviz.engine.Format; import guru.nidi.graphviz.engine.Format;
import guru.nidi.graphviz.engine.Graphviz; import guru.nidi.graphviz.engine.Graphviz;
import guru.nidi.graphviz.engine.GraphvizCmdLineEngine;
import guru.nidi.graphviz.engine.GraphvizJdkEngine;
import guru.nidi.graphviz.model.MutableGraph; import guru.nidi.graphviz.model.MutableGraph;
import guru.nidi.graphviz.parse.Parser; import guru.nidi.graphviz.parse.Parser;
import org.jgrapht.Graph; import org.jgrapht.Graph;
@ -141,9 +139,7 @@ public class Test {
}); });
de.exportGraph(screws, new File(PLOTS + name + ".dot")); de.exportGraph(screws, new File(PLOTS + name + ".dot"));
System.out.println(name); System.out.println(name);
Item.production(screws).forEach((item, rate) -> { Item.production(screws).forEach((item, rate) -> System.out.println("\t" + item.getName() + "\t" + rate));
System.out.println("\t" + item.getName() + "\t" + rate);
});
} }
private static void javaPlot(String name) { private static void javaPlot(String name) {

7
src/main/java/satisfactory/Utils.java
View File

@ -5,7 +5,6 @@ import org.jgrapht.event.ConnectedComponentTraversalEvent;
import org.jgrapht.event.EdgeTraversalEvent; import org.jgrapht.event.EdgeTraversalEvent;
import org.jgrapht.event.TraversalListener; import org.jgrapht.event.TraversalListener;
import org.jgrapht.event.VertexTraversalEvent; import org.jgrapht.event.VertexTraversalEvent;
import org.jgrapht.graph.DefaultDirectedWeightedGraph;
import org.jgrapht.graph.DefaultWeightedEdge; import org.jgrapht.graph.DefaultWeightedEdge;
import org.jgrapht.graph.EdgeReversedGraph; import org.jgrapht.graph.EdgeReversedGraph;
import org.jgrapht.nio.Attribute; import org.jgrapht.nio.Attribute;
@ -15,11 +14,9 @@ import org.jgrapht.traverse.DepthFirstIterator;
import org.jgrapht.traverse.GraphIterator; import org.jgrapht.traverse.GraphIterator;
import satisfactory.items.Item; import satisfactory.items.Item;
import satisfactory.items.ProductionEdge; import satisfactory.items.ProductionEdge;
import satisfactory.items.SumResult;
import java.io.File; import java.io.File;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -29,7 +26,7 @@ public class Utils {
public static Map<Item, Integer> getRawOnly(Map<Item, Integer> totals) { public static Map<Item, Integer> getRawOnly(Map<Item, Integer> totals) {
Map<Item, Integer> raws = new HashMap<>(); Map<Item, Integer> raws = new HashMap<>();
for (Item item : totals.keySet().stream().filter(Item::isRaw).collect(Collectors.toList())) { for (Item item : totals.keySet().stream().filter(Item::isRaw).toList()) {
raws.put(item, totals.get(item)); raws.put(item, totals.get(item));
} }
return raws; return raws;
@ -52,7 +49,7 @@ public class Utils {
EdgeReversedGraph<Item, DefaultWeightedEdge> inverse = new EdgeReversedGraph<>(graph); EdgeReversedGraph<Item, DefaultWeightedEdge> inverse = new EdgeReversedGraph<>(graph);
GraphIterator<Item, DefaultWeightedEdge> iterator = new DepthFirstIterator<>(inverse, target); GraphIterator<Item, DefaultWeightedEdge> iterator = new DepthFirstIterator<>(inverse, target);
iterator.addTraversalListener(new TraversalListener<Item, DefaultWeightedEdge>() { iterator.addTraversalListener(new TraversalListener<>() {
@Override @Override
public void connectedComponentFinished(ConnectedComponentTraversalEvent e) { public void connectedComponentFinished(ConnectedComponentTraversalEvent e) {
System.out.println("\tconnectedComponentFinished: " + e); System.out.println("\tconnectedComponentFinished: " + e);

4
src/main/java/satisfactory/items/Item.java
View File

@ -9,8 +9,8 @@ import java.util.*;
public abstract class Item { public abstract class Item {
protected boolean isRaw = false; protected boolean isRaw = false;
private String name; private final String name;
private Set<Recipe> recipes; private final Set<Recipe> recipes;
private Recipe preference = null; private Recipe preference = null;
public int sum = 0; public int sum = 0;

8
src/main/java/satisfactory/items/Recipe.java
View File

@ -5,7 +5,6 @@ import org.jgrapht.Graphs;
import org.jgrapht.graph.DefaultDirectedWeightedGraph; import org.jgrapht.graph.DefaultDirectedWeightedGraph;
import org.jgrapht.graph.DefaultWeightedEdge; import org.jgrapht.graph.DefaultWeightedEdge;
import satisfactory.buildings.Building; import satisfactory.buildings.Building;
import satisfactory.buildings.production.Assembler;
import satisfactory.items.requirements.RateAccumulator; import satisfactory.items.requirements.RateAccumulator;
import satisfactory.items.requirements.TotalAccumulator; import satisfactory.items.requirements.TotalAccumulator;
@ -130,6 +129,7 @@ public class Recipe {
} }
return outputs.entrySet().stream().filter(itemIntegerEntry -> isByProduct(reference, itemIntegerEntry.getKey())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); return outputs.entrySet().stream().filter(itemIntegerEntry -> isByProduct(reference, itemIntegerEntry.getKey())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
} }
public boolean isByProduct(Item reference, Item test) { public boolean isByProduct(Item reference, Item test) {
return !reference.equals(test) && outputs.containsKey(reference) && outputs.containsKey(test); return !reference.equals(test) && outputs.containsKey(reference) && outputs.containsKey(test);
} }
@ -182,7 +182,7 @@ public class Recipe {
Map<Item, Double> map = new HashMap<>(); Map<Item, Double> map = new HashMap<>();
Queue<Item> queue = new LinkedList<>(); Queue<Item> queue = new LinkedList<>();
queue.add(target); queue.add(target);
map.put(target, (double) prodPerMinute); map.put(target, prodPerMinute);
production.addVertex(target); production.addVertex(target);
production.addEdge(target, target, new ProductionEdge(target, target, prodPerMinute, processesNeeded(target, prodPerMinute))); production.addEdge(target, target, new ProductionEdge(target, target, prodPerMinute, processesNeeded(target, prodPerMinute)));
Set<Item> visited = new HashSet<>(); Set<Item> visited = new HashSet<>();
@ -237,9 +237,7 @@ public class Recipe {
} }
visited.add(item); visited.add(item);
} }
map.forEach((item, aDouble) -> { map.forEach((item, aDouble) -> System.out.println(item.getName() + ": " + aDouble));
System.out.println(item.getName() + ": " + aDouble);
});
return new SumResult(production, map); return new SumResult(production, map);
} }

5
src/main/java/satisfactory/items/SumResult.java
View File

@ -33,7 +33,7 @@ public class SumResult {
public SumResult merge(SumResult other) { public SumResult merge(SumResult other) {
HashMap<Item, Double> map = new HashMap<>(); HashMap<Item, Double> map = new HashMap<>();
this.map.forEach(map::put); map.putAll(this.map);
other.map.forEach((item, aDouble) -> map.merge(item, aDouble, Double::sum)); other.map.forEach((item, aDouble) -> map.merge(item, aDouble, Double::sum));
return new SumResult(merge(production, other.getProduction()), map); return new SumResult(merge(production, other.getProduction()), map);
} }
@ -58,8 +58,7 @@ public class SumResult {
graph1.vertexSet().forEach(result::addVertex); graph1.vertexSet().forEach(result::addVertex);
graph1.edgeSet().forEach(productionEdge -> { graph1.edgeSet().forEach(productionEdge -> {
List<ProductionEdge> collect = result.edgeSet().stream() List<ProductionEdge> collect = result.edgeSet().stream()
.filter(productionEdge1 -> productionEdge1.hasSource(productionEdge.getSource())) .filter(productionEdge1 -> productionEdge1.hasSource(productionEdge.getSource())).toList();
.collect(Collectors.toList());
collect.forEach(edge -> { collect.forEach(edge -> {
Item src = result.getEdgeSource(edge); Item src = result.getEdgeSource(edge);
Item target = result.getEdgeTarget(edge); Item target = result.getEdgeTarget(edge);

4
src/main/java/satisfactory/items/requirements/RateAccumulator.java
View File

@ -7,11 +7,11 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class RateAccumulator extends Accumulator<Double> { public class RateAccumulator extends Accumulator<Double> {
private Item item; private final Item item;
public RateAccumulator(Recipe recipe, Item item) { public RateAccumulator(Recipe recipe, Item item) {
super(new HashMap<>()); super(new HashMap<>());
recipe.getInputs().forEach((item1, integer) -> inputs.put(item1, integer)); inputs.putAll(recipe.getInputs());
this.item = item; this.item = item;
} }

3
src/test/java/satisfactory/items/DatabaseTest.java
View File

@ -2,6 +2,7 @@ package satisfactory.items;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import satisfactory.Database; import satisfactory.Database;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
public class DatabaseTest { public class DatabaseTest {
@ -9,7 +10,7 @@ public class DatabaseTest {
void testWaterPreference() { void testWaterPreference() {
Item i = Database.Water; Item i = Database.Water;
assertSame(i.getPreference(), i.getRecipe()); assertSame(i.getPreference(), i.getRecipe());
assertTrue(i.getPreference() == i.getRecipe()); assertSame(i.getPreference(), i.getRecipe());
assertTrue(i.getRecipe().toString().contains("water pump thingy")); assertTrue(i.getRecipe().toString().contains("water pump thingy"));
} }
} }