From 6c34efdc2bc5ee307a82c5d04e4f139ce37a6686 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 22 Dec 2025 12:26:01 +0100 Subject: [PATCH] Fixing revert/merge difference in code --- src/misc/tim/timMan.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/misc/tim/timMan.c b/src/misc/tim/timMan.c index 7e112669e..9bcdaaae6 100644 --- a/src/misc/tim/timMan.c +++ b/src/misc/tim/timMan.c @@ -451,19 +451,31 @@ void Tim_ManCreate( Tim_Man_t * p, void * pLib, Vec_Flt_t * vInArrs, Vec_Flt_t * // create arrival times if ( vInArrs ) { - assert( Vec_FltSize(vInArrs) == Tim_ManPiNum(p) ); - Tim_ManForEachPi( p, pObj, i ) - pObj->timeArr = Vec_FltEntry(vInArrs, i); - + if ( Vec_FltSize(vInArrs) == Tim_ManPiNum(p) ) { + Tim_ManForEachPi( p, pObj, i ) + pObj->timeArr = Vec_FltEntry(vInArrs, i); + } + else if ( Vec_FltSize(vInArrs) == Tim_ManCiNum(p) ) { + Tim_ManForEachCi( p, pObj, i ) + pObj->timeArr = Vec_FltEntry(vInArrs, i); + } + else assert( 0 ); } // create required times if ( vOutReqs ) { k = 0; - assert( Vec_FltSize(vOutReqs) == Tim_ManPoNum(p) ); - Tim_ManForEachPo( p, pObj, i ) - pObj->timeReq = Vec_FltEntry(vOutReqs, k++); - assert( k == Tim_ManPoNum(p) ); + if ( Vec_FltSize(vOutReqs) == Tim_ManPoNum(p) ) { + Tim_ManForEachPo( p, pObj, i ) + pObj->timeReq = Vec_FltEntry(vOutReqs, k++); + assert( k == Tim_ManPoNum(p) ); + } + else if ( Vec_FltSize(vOutReqs) == Tim_ManCoNum(p) ) { + Tim_ManForEachCo( p, pObj, i ) + pObj->timeReq = Vec_FltEntry(vOutReqs, k++); + assert( k == Tim_ManCoNum(p) ); + } + else assert( 0 ); } }