Skip to content

Commit f19e9a0

Browse files
Tom BrouwsTom Brouws
Tom Brouws
authored and
Tom Brouws
committed
Merge pull request #93 from ProgrammingLife3/feat/logInterest
Feat/log interest
2 parents 8946b97 + bd37f19 commit f19e9a0

16 files changed

+22
-661
lines changed

src/main/java/tudelft/ti2806/pl3/data/wrapper/WrappedGraphData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import tudelft.ti2806.pl3.data.graph.DataNode;
55
import tudelft.ti2806.pl3.data.graph.Edge;
66
import tudelft.ti2806.pl3.data.graph.GraphData;
7-
import tudelft.ti2806.pl3.data.wrapper.operation.interest.ComputeInterest;
7+
import tudelft.ti2806.pl3.data.wrapper.util.interest.ComputeInterest;
88

99
import java.util.List;
1010

@@ -36,8 +36,8 @@ public WrappedGraphData(List<Wrapper> nodeWrappers) {
3636
private void init() {
3737
for (Wrapper wrapper : nodeWrappers) {
3838
wrapper.calculateX();
39-
ComputeInterest.compute(wrapper);
4039
}
40+
ComputeInterest.compute(nodeWrappers);
4141
}
4242

4343
public WrappedGraphData(List<DataNode> nodes, List<Edge> edges) {

src/main/java/tudelft/ti2806/pl3/data/wrapper/operation/interest/CalculateAddMaxOfWrapped.java

Lines changed: 0 additions & 46 deletions
This file was deleted.

src/main/java/tudelft/ti2806/pl3/data/wrapper/operation/interest/CalculateGroupInterest.java

Lines changed: 0 additions & 97 deletions
This file was deleted.

src/main/java/tudelft/ti2806/pl3/data/wrapper/operation/interest/CalculateMultiplyWithContainerInterest.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

src/main/java/tudelft/ti2806/pl3/data/wrapper/operation/interest/CalculateNInterest.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/main/java/tudelft/ti2806/pl3/data/wrapper/operation/interest/CalculateSizeInterest.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/main/java/tudelft/ti2806/pl3/data/wrapper/operation/interest/CalculateWrapPressureInterest.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/main/java/tudelft/ti2806/pl3/data/wrapper/operation/interest/ComputeInterest.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)