api: POST /api/scenario returns result plus graph topology (M3 slice 1)

One panel's whole world in one call: effective config in, echoed
config + cascade result + undirected edge list out. Edges are
[from, to] pairs with from < to in deterministic node order;
Graph.Edges() walks the adjacency once, GraphEdges(config) rebuilds
the seeded world (~25us) so Result stays lean and /api/comparison
stays untouched. This closes the topology gap the design brief
flagged; the frontend's seeded d3-force layout consumes these pairs.
Go bits: [][2]int is a slice of fixed-size arrays; [2]int is a value
type, comparable, and JSON-marshals to [a, b], exactly the wire
shape the spec asks for.
tygo regen includes a fix: engine.Strategy now maps to the generated
Strategy type instead of decaying to 'any' in ScenarioRequest.
Verified live through the dev stack: 7/120 reached, 351 edges.
This commit is contained in:
Justin Visser 2026-06-10 15:48:48 +02:00
parent 8c8d5bca11
commit 9a392b1860
12 changed files with 1790 additions and 2 deletions

View file

@ -48,3 +48,18 @@ func (g *Graph) Degree(u int) int { return len(g.adj[u]) }
// Neighbors returns u's neighbours in insertion order. The slice is the
// graph's own storage: callers must not modify it.
func (g *Graph) Neighbors(u int) []int { return g.adj[u] }
// Edges returns every undirected edge exactly once as a [from, to] pair
// with from < to, in deterministic node order. The slice is freshly
// allocated; callers may keep it.
func (g *Graph) Edges() [][2]int {
edges := make([][2]int, 0, g.edges)
for node := range g.NumNodes() {
for _, neighbor := range g.adj[node] {
if node < neighbor {
edges = append(edges, [2]int{node, neighbor})
}
}
}
return edges
}

View file

@ -74,3 +74,56 @@ func TestGraphNeighborsAndDegree(t *testing.T) {
t.Error("HasEdge(1, 2) = true, want false")
}
}
func TestGraphEdgesListsEveryEdgeOnce(t *testing.T) {
graph := NewGraph(4)
graph.AddEdge(2, 1) // insertion order must not matter; pairs come out from < to
graph.AddEdge(0, 1)
graph.AddEdge(3, 0)
want := [][2]int{{0, 1}, {0, 3}, {1, 2}}
if got := graph.Edges(); !slices.Equal(got, want) {
t.Errorf("Edges() = %v, want %v", got, want)
}
}
func TestGraphEdgesMatchesGeneratedGraph(t *testing.T) {
graph, err := HolmeKim(60, 3, 0.45, newRand(17))
if err != nil {
t.Fatal(err)
}
edges := graph.Edges()
if len(edges) != graph.NumEdges() {
t.Fatalf("len(Edges()) = %d, want NumEdges() = %d", len(edges), graph.NumEdges())
}
for _, edge := range edges {
from, to := edge[0], edge[1]
if from >= to {
t.Errorf("edge %v: want from < to", edge)
}
if to >= graph.NumNodes() {
t.Errorf("edge %v: endpoint out of range", edge)
}
if !graph.HasEdge(from, to) {
t.Errorf("edge %v not present in adjacency", edge)
}
}
}
func TestGraphEdgesDeterministicFromConfig(t *testing.T) {
first, err := GraphEdges(DefaultConfig())
if err != nil {
t.Fatal(err)
}
second, err := GraphEdges(DefaultConfig())
if err != nil {
t.Fatal(err)
}
if !slices.Equal(first, second) {
t.Error("GraphEdges() differs across identical configs")
}
if len(first) == 0 {
t.Error("GraphEdges() returned no edges")
}
}

View file

@ -60,6 +60,18 @@ type Result struct {
ReachedPct float64 `json:"reachedPct"`
}
// GraphEdges builds the world's social network from the config's graph
// fields and returns its undirected edge list. The same config always
// yields the same edges (seeded generator), so the API can expose
// topology separately without every Result carrying it.
func GraphEdges(config Config) ([][2]int, error) {
graph, err := HolmeKim(config.NumStudents, config.EdgesPerNode, config.TriangleProb, newRand(config.GraphSeed))
if err != nil {
return nil, err
}
return graph.Edges(), nil
}
// RunScenario builds the world the config describes (network plus edge
// thresholds), picks the educated students per strategy, and runs the
// cascade. Scenarios with the same config share the same world, so