Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pyeda/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
Python EDA Package
"""

__version__ = "0.29.0"
__version__ = "0.30.0"

2 changes: 1 addition & 1 deletion thirdparty/espresso/src/cofactor.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ simplify_cubelist(set **T)
set_copy(CUBE.temp[0], T[0]); // retrieve cofactor

ncubes = CUBELISTSIZE(T);
qsort((char *) (T+2), ncubes, sizeof(set *), d1_order);
qsort((char *) (T+2), ncubes, sizeof(set *), d1_order_cmp);

Tdest = T+2;
// *Tdest++ = T[2];
Expand Down
4 changes: 2 additions & 2 deletions thirdparty/espresso/src/compl.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ static set_family_t *compl_merge(set **T1, set_family_t *L, set_family_t *R, set

/* Sort the arrays for a distance-1 merge */
set_copy(CUBE.temp[0], CUBE.var_mask[var]);
qsort((char *) (L1 = sf_list(L)), L->count, sizeof(set *), d1_order);
qsort((char *) (R1 = sf_list(R)), R->count, sizeof(set *), d1_order);
qsort((char *) (L1 = sf_list(L)), L->count, sizeof(set *), d1_order_cmp);
qsort((char *) (R1 = sf_list(R)), R->count, sizeof(set *), d1_order_cmp);

/* Perform distance-1 merge */
compl_d1merge(L1, R1);
Expand Down
1 change: 1 addition & 0 deletions thirdparty/espresso/src/espresso.h
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,7 @@ int cactive(set *a);
int cdist(set *a, set *b);
int cdist01(set *a, set *b);
int d1_order(set **a, set **b);
int d1_order_cmp(const void *a, const void *b);
int desc1(set *a, set *b);
int descend(set **a, set **b);
int lex_order(set **a, set **b);
Expand Down
6 changes: 6 additions & 0 deletions thirdparty/espresso/src/setc.c
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,12 @@ d1_order(set **a, set **b)
return 0;
}

int
d1_order_cmp(const void *a, const void *b)
{
return d1_order((set **) a, (set **) b);
}

// desc1 -- comparison (without indirection) for descending sort
// also has effect of handling NULL pointers,and a NULL pointer has smallest
// order
Expand Down