talezero/lzf1
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Teppy
2025-01-20 16:16:43 -05:00
parent de03fa8741
commit 76a4610903
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
1.log
View File

@@ -1 +0,0 @@
NOP Error:

8
demo.log
View File

@@ -9,7 +9,7 @@ AF 1 1 500000000 ; addfunds Teppy 5 BTC
AF 2 0 186A000000000 ; addfunds Luni 100000 USD AF 2 0 186A000000000 ; addfunds Luni 100000 USD
AF 3 0 186A000000000 ; addfunds Hamza 100000 USD AF 3 0 186A000000000 ; addfunds Hamza 100000 USD
OR 1 1 200000000 0 186A000000000 ; [login Teppy] order 2 BTC 100000 USD OR 1 1 200000000 0 186A000000000 ; [login Teppy] order 2 BTC 100000 USD
OR 2 0 753000000000 1 80000000 ; [login Luni] order 30000 USD 0.5 BTC NOP OR 2 0 753000000000 1 80000000 ; [login Luni] order 30000 USD 0.5 BTC
OR 2 0 4E2000000000 1 80000000 ; [login Luni] order 20000 USD 0.5 BTC NOP OR 2 0 4E2000000000 1 80000000 ; [login Luni] order 20000 USD 0.5 BTC
OR 2 0 55F000000000 1 80000000 NOP OR 2 0 55F000000000 1 80000000 ; [login Luni] order 22000 USD 0.5 BTC
OR 2 1 40000000 0 35B600000000 NOP OR 2 1 40000000 0 35B600000000 ; [login Luni] order 0.25 BTC 13750 USD

32
src/main.rs
View File

@@ -248,11 +248,12 @@ impl RoyaltyTree {
} }
} }
// We really need two methods: remove an order and redistribute, remove some and return captured amount // We really need two methods: remove an order and redistribute, remove some and return captured amount
fn remove_order_id(&mut self, id: usize) { // And zero out in the tree fn remove_order_id(&mut self, id: usize) -> FiNum { // And zero out in the tree
if let Some(pos)=self.order_finder.remove(&id) { if let Some(pos)=self.order_finder.remove(&id) {
let weight=self.weight_here(pos); let weight=self.weight_here(pos);
self.sub_weight(pos,weight); self.sub_weight(pos,weight)
} }
else { FiNum::zero() }
} }
fn random_order_id(&self, rng: &mut rand::rngs::StdRng) -> Option<usize> { fn random_order_id(&self, rng: &mut rand::rngs::StdRng) -> Option<usize> {
if self.tree.len()==0 { return None } if self.tree.len()==0 { return None }
@@ -273,12 +274,23 @@ impl RoyaltyTree {
fn capture_partial(&mut self, id: usize, weight: FiNum) -> FiNum { fn capture_partial(&mut self, id: usize, weight: FiNum) -> FiNum {
FiNum::zero() FiNum::zero()
} }
fn sub_weight(&mut self, index: usize, mut weight: FiNum) { fn sub_weight(&mut self, index: usize, mut weight: FiNum) -> FiNum {
self.get_royalty(index); self.get_royalty(index);
let delta_count; let delta_count;
let wh=self.weight_here(index); let wh=self.weight_here(index);
let redist=if weight>=wh { delta_count=if wh>FiNum::zero() { 1 } else { 0 }; weight=wh; self.tree[index].acc } let dist;
else { delta_count=0; self.tree[index].acc*weight/wh }; let redist;
if weight>=wh {
delta_count=if wh>FiNum::zero() { 1 } else { 0 };
weight=wh;
dist=self.tree[index].acc;
redist=FiNum::zero();
}
else {
delta_count=0;
dist=self.tree[index].acc*weight/wh;
redist=self.tree[index].acc-dist;
}
self.tree[index].acc-=redist; self.tree[index].acc-=redist;
let mut index=index; let mut index=index;
let ff=self.forefather(); let ff=self.forefather();
@@ -289,6 +301,7 @@ impl RoyaltyTree {
index=wt_parent(index); index=wt_parent(index);
} }
self.add_royalty(redist); self.add_royalty(redist);
dist
} }
fn set_location(&mut self, id: usize, index: usize) { fn set_location(&mut self, id: usize, index: usize) {
self.tree[index].order_id=id; self.tree[index].order_id=id;
@@ -574,6 +587,7 @@ impl Market {
fn retract_order(&mut self, order_id:usize) -> Result { // Still need to credit back funds! fn retract_order(&mut self, order_id:usize) -> Result { // Still need to credit back funds!
let pair=self.order_finder.get(&order_id).unwrap(); let pair=self.order_finder.get(&order_id).unwrap();
let sell_type=pair.0; let sell_type=pair.0;
let buy_type=pair.1;
let queue=self.orders.get_mut(pair).unwrap(); let queue=self.orders.get_mut(pair).unwrap();
let queue_index=*queue.order_finder.get(&order_id).unwrap(); let queue_index=*queue.order_finder.get(&order_id).unwrap();
let order=&queue.v[queue_index]; let order=&queue.v[queue_index];
@@ -582,7 +596,8 @@ impl Market {
println!("Order owner is {}",order.owner); println!("Order owner is {}",order.owner);
// Remove from royalties // Remove from royalties
let rt=self.royalties.get_mut(&pair.0).unwrap(); let rt=self.royalties.get_mut(&pair.0).unwrap();
rt.remove_order_id(order_id); let dist=rt.remove_order_id(order_id);
self.traders[order.owner].add_balance(buy_type,dist);
// Remove from order_finder // Remove from order_finder
self.order_finder.remove(&order_id); self.order_finder.remove(&order_id);
// Remove from orders // Remove from orders
@@ -644,7 +659,8 @@ impl Market {
//if !top_order.commission_remain.is_zero() { println!("Little commission? {} ",top_order.commission_remain); } //if !top_order.commission_remain.is_zero() { println!("Little commission? {} ",top_order.commission_remain); }
let rq3=top_order.royalty_remain; let rq3=top_order.royalty_remain;
let cq3=top_order.commission_remain; let cq3=top_order.commission_remain;
self.royalties.get_mut(&buy_type).unwrap().remove_order_id(top_order.order_id); let dist=self.royalties.get_mut(&buy_type).unwrap().remove_order_id(top_order.order_id);
self.traders[elt.owner].add_balance(sell_type,dist);
self.order_finder.remove(&top_order.order_id); self.order_finder.remove(&top_order.order_id);
self.traders[top_order.owner].order_finder.remove(&top_order.order_id); self.traders[top_order.owner].order_finder.remove(&top_order.order_id);
self.orders.get_mut(&ap).unwrap().pop(); // This removes id (which is stored as part of the Order) from self.order's finder self.orders.get_mut(&ap).unwrap().pop(); // This removes id (which is stored as part of the Order) from self.order's finder
@@ -920,7 +936,7 @@ fn royalty_stuff() {
let node=rng.gen_range(0..10); let node=rng.gen_range(0..10);
match rng.gen_range(0..10) { match rng.gen_range(0..10) {
0 => rt.add_weight(node,FiNum::new_i32(rng.gen_range(0..101))), 0 => rt.add_weight(node,FiNum::new_i32(rng.gen_range(0..101))),
1 => rt.sub_weight(node,FiNum::new_i32(rng.gen_range(0..101))), 1 => { rt.sub_weight(node,FiNum::new_i32(rng.gen_range(0..101))); },
2 => rt.add_royalty(FiNum::new_i32(rng.gen_range(0..10))), 2 => rt.add_royalty(FiNum::new_i32(rng.gen_range(0..10))),
// 3 => println!("Random Order ID: {:?}",rt.random_order_id(&mut rng)), // 3 => println!("Random Order ID: {:?}",rt.random_order_id(&mut rng)),
_ => (), _ => (),