optimize core splitter simulation logic a bit

d4rkc0d3r · Nov 9, 2024 · a6ae0e3 · a6ae0e3
1 parent b4d5398
commit a6ae0e3
Showing 1 changed file with 10 additions and 32 deletions.
diff --git a/BeltBalancer/BeltEntity.cpp b/BeltBalancer/BeltEntity.cpp
@@ -709,45 +709,23 @@ int updateOnCPUSorted(BeltEntity* entities, size_t size, unsigned int iterations
 			float supply = lsupply + rsupply;
 			if (demand >= supply)
 			{
-				float halfSupply = supply / 2;
 				b->subtractFromBuffer = lsupply;
 				r->subtractFromBuffer = rsupply;
-				if (ldemand < halfSupply)
-				{
-					lnext->addToBuffer = ldemand;
-					rnext->addToBuffer = supply - ldemand;
-				}
-				else if (rdemand < halfSupply)
-				{
-					rnext->addToBuffer = rdemand;
-					lnext->addToBuffer = supply - rdemand;
-				}
-				else
-				{
-					lnext->addToBuffer = halfSupply;
-					rnext->addToBuffer = halfSupply;
-				}
+				float pushLeft = minss(ldemand, supply / 2);
+				float pushRight = minss(rdemand, supply - pushLeft);
+				pushLeft = supply - pushRight;
+				lnext->addToBuffer = pushLeft;
+				rnext->addToBuffer = pushRight;
 			}
 			else
 			{
-				float halfDemand = demand / 2;
 				lnext->addToBuffer = ldemand;
 				rnext->addToBuffer = rdemand;
-				if (lsupply < halfDemand)
-				{
-					b->subtractFromBuffer = lsupply;
-					r->subtractFromBuffer = demand - lsupply;
-				}
-				else if (rsupply < halfDemand)
-				{
-					r->subtractFromBuffer = rsupply;
-					b->subtractFromBuffer = demand - rsupply;
-				}
-				else
-				{
-					r->subtractFromBuffer = halfDemand;
-					b->subtractFromBuffer = halfDemand;
-				}
+				float subLeft = minss(lsupply, demand / 2);
+				float subRight = minss(rsupply, demand - subLeft);
+				subLeft = demand - subRight;
+				b->subtractFromBuffer = subLeft;
+				r->subtractFromBuffer = subRight;
 			}
 		}