Skip to content

Tickets/fiberalloc 56: disable trajectory collision checks #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mreineck wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Tickets/fiberalloc 56: disable trajectory collision checks #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69a78e8
start removing trajectory collision tests from netflow
mreineck Feb 13, 2026
06ce71b
remove more trajectory collision checks
mreineck Feb 13, 2026
0478a3a
Merge branch 'master' into disable_trajectory_collisions
mreineck Feb 13, 2026
d1cb641
remove unnecessary comment
mreineck Feb 13, 2026
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
92 changes: 21 additions & 71 deletions demo_netflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import ets_fiber_assigner.netflow as nf
import numpy as np
from ics.cobraOps.TargetGroup import TargetGroup
from ics.cobraOps.CollisionSimulator import CollisionSimulator
from ics.cobraOps import plotUtils
from collections import defaultdict
from getBench import getBench

Expand Down Expand Up @@ -89,63 +86,28 @@ def cobraMoveCost(dist):
#for t in tgt[::10]:
# alreadyObserved[t.ID] = 1*t_obs

forbiddenPairs = []
for i in range(nvisit):
forbiddenPairs.append([])

done = False
while not done:
# compute observation strategy
prob = nf.buildProblem(bench, tgt, tpos, classdict, t_obs,
vis_cost, cobraMoveCost=cobraMoveCost,
collision_distance=2., elbow_collisions=True,
gurobi=False, gurobiOptions=gurobiOptions,
alreadyObserved=alreadyObserved,
forbiddenPairs=forbiddenPairs)

# print("writing problem to file ", mpsName)
# prob.dump(mpsName)

print("solving the problem")
prob.solve()

# extract solution
res = [{} for _ in range(nvisit)]
for k1, v1 in prob._vardict.items():
if k1.startswith("Tv_Cv_"):
visited = prob.value(v1) > 0
if visited:
_, _, tidx, cidx, ivis = k1.split("_")
res[int(ivis)][int(tidx)] = int(cidx)

print("Checking for trajectory collisions")
ncoll = 0
for ivis, (vis, tp) in enumerate(zip(res, tpos)):
selectedTargets = np.full(len(bench.cobras.centers), TargetGroup.NULL_TARGET_POSITION)
ids = np.full(len(bench.cobras.centers), TargetGroup.NULL_TARGET_ID)
for tidx, cidx in vis.items():
selectedTargets[cidx] = tp[tidx]
ids[cidx] = ""

simulator = CollisionSimulator(bench, TargetGroup(selectedTargets, ids))
simulator.run()
if np.any(simulator.endPointCollisions):
print("ERROR: detected end point collision, which should be impossible",
np.sum(simulator.endPointCollisions))
simulator.plotResults(paintFootprints=False)
plotUtils.pauseExecution()
coll_tidx = []
for tidx, cidx in vis.items():
if simulator.collisions[cidx]:
coll_tidx.append(tidx)
ncoll += len(coll_tidx)
for i1 in range(0,len(coll_tidx)):
for i2 in range(i1+1,len(coll_tidx)):
if np.abs(tp[coll_tidx[i1]]-tp[coll_tidx[i2]])<10:
forbiddenPairs[ivis].append((coll_tidx[i1],coll_tidx[i2]))
# compute observation strategy
prob = nf.buildProblem(bench, tgt, tpos, classdict, t_obs,
vis_cost, cobraMoveCost=cobraMoveCost,
collision_distance=2., elbow_collisions=True,
gurobi=False, gurobiOptions=gurobiOptions,
alreadyObserved=alreadyObserved)

# print("writing problem to file ", mpsName)
# prob.dump(mpsName)

print("solving the problem")
prob.solve()

# extract solution
res = [{} for _ in range(nvisit)]
for k1, v1 in prob._vardict.items():
if k1.startswith("Tv_Cv_"):
visited = prob.value(v1) > 0
if visited:
_, _, tidx, cidx, ivis = k1.split("_")
res[int(ivis)][int(tidx)] = int(cidx)

print("trajectory collisions found:", ncoll)
done = ncoll == 0

# write output file
with open("output.txt", "w") as f:
Expand All @@ -164,15 +126,3 @@ def cobraMoveCost(dist):
tgt[tidx].ra, tgt[tidx].dec))
for cls, num in tdict.items():
print(" {}: {}".format(cls, num))

for vis, tp in zip(res, tpos):
selectedTargets = np.full(len(bench.cobras.centers), TargetGroup.NULL_TARGET_POSITION)
ids = np.full(len(bench.cobras.centers), TargetGroup.NULL_TARGET_ID)
for tidx, cidx in vis.items():
selectedTargets[cidx] = tp[tidx]
ids[cidx] = ""

simulator = CollisionSimulator(bench, TargetGroup(selectedTargets, ids))
simulator.run()
simulator.plotResults(paintFootprints=False)
plotUtils.pauseExecution()
103 changes: 24 additions & 79 deletions demo_netflow_regions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import ets_fiber_assigner.netflow as nf
import numpy as np
from ics.cobraOps.TargetGroup import TargetGroup
from ics.cobraOps import plotUtils
from collections import defaultdict
from ics.cobraOps.CollisionSimulator import CollisionSimulator
from getBench import getBench

# make runs reproducible
Expand Down Expand Up @@ -64,72 +61,35 @@ def cobraMoveCost(dist):
for t in tgt[::10]:
alreadyObserved[t.ID] = 1

forbiddenPairs = []
for i in range(nvisit):
forbiddenPairs.append([])


# define two location regions arbitrarily
ncobras = bench.cobras.nCobras
cobraRegions=np.zeros(ncobras,dtype=np.int32)
cobraRegions[ncobras//2:] = 1

done = False
while not done:
# compute observation strategy
prob = nf.buildProblem(bench, tgt, tpos, classdict, t_obs,
vis_cost, cobraMoveCost=cobraMoveCost,
collision_distance=2., elbow_collisions=True,
gurobi=False, gurobiOptions=gurobiOptions,
alreadyObserved=alreadyObserved,
forbiddenPairs=forbiddenPairs,
cobraLocationGroup=cobraRegions,
minSkyTargetsPerLocation=40,
locationGroupPenalty=1e9)

# print("writing problem to file ", mpsName)
# prob.dump(mpsName)

print("solving the problem")
prob.solve()

# extract solution
res = [{} for _ in range(nvisit)]
for k1, v1 in prob._vardict.items():
if k1.startswith("Tv_Cv_"):
visited = prob.value(v1) > 0
if visited:
_, _, tidx, cidx, ivis = k1.split("_")
res[int(ivis)][int(tidx)] = int(cidx)

print("Checking for trajectory collisions")
ncoll = 0
for ivis, (vis, tp) in enumerate(zip(res, tpos)):
selectedTargets = np.full(len(bench.cobras.centers), TargetGroup.NULL_TARGET_POSITION)
ids = np.full(len(bench.cobras.centers), TargetGroup.NULL_TARGET_ID)
for tidx, cidx in vis.items():
selectedTargets[cidx] = tp[tidx]
ids[cidx] = ""
for i in range(selectedTargets.size):
if selectedTargets[i] != TargetGroup.NULL_TARGET_POSITION:
dist = np.abs(selectedTargets[i]-bench.cobras.centers[i])

simulator = CollisionSimulator(bench, TargetGroup(selectedTargets, ids))
simulator.run()
if np.any(simulator.endPointCollisions):
print("ERROR: detected end point collision, which should be impossible")
coll_tidx = []
for tidx, cidx in vis.items():
if simulator.collisions[cidx]:
coll_tidx.append(tidx)
ncoll += len(coll_tidx)
for i1 in range(0,len(coll_tidx)):
for i2 in range(i1+1,len(coll_tidx)):
if np.abs(tp[coll_tidx[i1]]-tp[coll_tidx[i2]])<10:
forbiddenPairs[ivis].append((coll_tidx[i1],coll_tidx[i2]))

print("trajectory collisions found:", ncoll)
done = ncoll == 0
# compute observation strategy
prob = nf.buildProblem(bench, tgt, tpos, classdict, t_obs,
vis_cost, cobraMoveCost=cobraMoveCost,
collision_distance=2., elbow_collisions=True,
gurobi=False, gurobiOptions=gurobiOptions,
alreadyObserved=alreadyObserved,
cobraLocationGroup=cobraRegions,
minSkyTargetsPerLocation=40,
locationGroupPenalty=1e9)

# print("writing problem to file ", mpsName)
# prob.dump(mpsName)

print("solving the problem")
prob.solve()

# extract solution
res = [{} for _ in range(nvisit)]
for k1, v1 in prob._vardict.items():
if k1.startswith("Tv_Cv_"):
visited = prob.value(v1) > 0
if visited:
_, _, tidx, cidx, ivis = k1.split("_")
res[int(ivis)][int(tidx)] = int(cidx)

# write output file
with open("output.txt", "w") as f:
Expand All @@ -148,18 +108,3 @@ def cobraMoveCost(dist):
tgt[tidx].ra, tgt[tidx].dec))
for cls, num in tdict.items():
print(" {}: {}".format(cls, num))

for vis, tp in zip(res, tpos):
selectedTargets = np.full(len(bench.cobras.centers), TargetGroup.NULL_TARGET_POSITION)
ids = np.full(len(bench.cobras.centers), TargetGroup.NULL_TARGET_ID)
for tidx, cidx in vis.items():
selectedTargets[cidx] = tp[tidx]
ids[cidx] = ""
for i in range(selectedTargets.size):
if selectedTargets[i] != TargetGroup.NULL_TARGET_POSITION:
dist = np.abs(selectedTargets[i]-bench.cobras.centers[i])

simulator = CollisionSimulator(bench, TargetGroup(selectedTargets, ids))
simulator.run()
simulator.plotResults(paintFootprints=False)
plotUtils.pauseExecution()
Loading