Skip to content

Fix large-model segment/patch collisions and EX source resolution #21

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

Merged
maurymarkowitz merged 2 commits into from
Sep 15, 2026
Merged

Fix large-model segment/patch collisions and EX source resolution #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
262555f
Fix EX source segment resolution
torinwalker Sep 12, 2026
ef4f56c
Fix patch connection namespace collision
torinwalker Sep 12, 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
8 changes: 6 additions & 2 deletions src/internals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@
#define NTS 4
#define SMIN 1.e-3

/* Replaces the "10000" limit used to identiy segment/patch connections */
#define PCHCON 10000
/*
* Keep the patch-connection namespace above practical wire-segment counts.
* PCHCON is used to distinguish patch connections from ordinary segment
* connections, so it must not overlap valid generated segment numbers.
*/
#define PCHCON 1000000000

/* carriage return and line feed */
#define CR 0x0d
Expand Down
12 changes: 9 additions & 3 deletions src/reporting.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,11 +880,17 @@ static int process_ex_card(context_t *ctx, const card_t *card, card_state_t *sta
if (cabs(voltage) < 1e-20) {
voltage = 1.0 + 0.0*I; /* Default to 1 volt */
}


/*
* EX specifies a segment relative to its tag, but the queued source is
* subsequently processed using an absolute/global segment number.
*/
int global_seg = segment_number(ctx, tag, seg);

if (extype == 0) {
return add_voltage_source(ctx, tag, seg, voltage);
return add_voltage_source(ctx, tag, global_seg, voltage);
} else {
return add_current_source(ctx, tag, seg, voltage);
return add_current_source(ctx, tag, global_seg, voltage);
}
}
else if (extype >= 1 && extype <= 4) {
Expand Down