Dusk/aux-addon-ClassicAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working on new history code

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-02-07 23:49:54 +01:00
parent 4d1a61961d
commit 8a0ee6ff38
11 changed files with 205 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Aux-AddOn.toc
+2 -2
View File
@@ -2,7 +2,7 @@
## Title: Aux
## Notes: A lightweight addon designed to help manage auctions
## SavedVariablesPerCharacter: aux_recent_searches, aux_favorite_searches, aux_price_per_unit, aux_scale
## SavedVariables: aux_database, aux_auctionable_items, aux_max_bids
## SavedVariables: aux_database, aux_auctionable_items
slash.lua
core.xml
@@ -20,7 +20,7 @@ post.lua
listing.lua
auction_listing.lua
item_listing.lua
history.lua
history.xml
info.xml
completion.xml
core.lua
+18 -16
View File
@@ -19,26 +19,28 @@ function Aux.on_load()
local item_id, suffix_id = EnhTooltip.BreakLink(link)
local item_key = (item_id or 0)..':'..(suffix_id or 0)
local auction_count, day_count, daily_market_value, median = Aux.history.price_data(item_key)
-- local auction_count, day_count, daily_market_value, median = Aux.history.price_data(item_key)
if auction_count == 0 then
EnhTooltip.AddLine('Never seen at auction', nil, true)
EnhTooltip.LineColor(0.5, 0.8, 0.5)
else
EnhTooltip.AddLine('Seen '..auction_count..' '..Aux_PluralizeIf('time', auction_count)..' at auction', nil, true)
EnhTooltip.LineColor(0.5, 0.8, 0.1)
-- if auction_count == 0 then
-- EnhTooltip.AddLine('Never seen at auction', nil, true)
-- EnhTooltip.LineColor(0.5, 0.8, 0.5)
-- else
-- EnhTooltip.AddLine('Seen '..auction_count..' '..Aux_PluralizeIf('time', auction_count)..' at auction', nil, true)
-- EnhTooltip.LineColor(0.5, 0.8, 0.1)
local market_value = Aux.history.market_value(item_key)
local market_value_line
if count == 1 then
market_value_line = 'Market Value: '..EnhTooltip.GetTextGSC(market_value)
else
market_value_line = 'Market Value: '..EnhTooltip.GetTextGSC(market_value * count)..' / '..EnhTooltip.GetTextGSC(market_value)
end
if market_value then
local market_value_line
if count == 1 then
market_value_line = 'Market Value: '..EnhTooltip.GetTextGSC(market_value)
else
market_value_line = 'Market Value: '..EnhTooltip.GetTextGSC(market_value * count)..' / '..EnhTooltip.GetTextGSC(market_value)
end
EnhTooltip.AddLine(market_value_line, nil, true)
EnhTooltip.LineColor(0.1,0.8,0.5)
end
EnhTooltip.AddLine(market_value_line, nil, true)
EnhTooltip.LineColor(0.1,0.8,0.5)
end
-- end
end)
end
history.lua
+154 -110
View File
@@ -2,130 +2,174 @@ local private, public = {}, {}
Aux.history = public
private.PUSH_INTERVAL = 57600
private.NEW_RECORD = '0#0##'
function private.load_data()
local dataset = Aux.persistence.load_dataset()
dataset.history = dataset.history or { next_push = time() + private.PUSH_INTERVAL, item_data = {} }
return dataset.history
local item_records, next_push
function private.encode_item_records(item_records)
local record_strings = {}
for item_key, record in pairs(item_records) do
tinsert(record_strings, private.encode_item_record(item_key, record))
end
return Aux.persistence.serialize(record_strings, '|')
end
function private.read_record(item_key)
local data = private.load_data()
local record = Aux.persistence.deserialize(data.item_data[item_key] or private.NEW_RECORD, '#')
return {
auction_count = tonumber(record[1]),
day_count = tonumber(record[2]),
last_daily_values = Aux.util.map(Aux.persistence.deserialize(record[3], ';'), function(value)
function private.encode_item_record(item_key, record)
return Aux.persistence.serialize({
item_key,
Aux.persistence.serialize(record.daily_bid_values, ';'),
Aux.persistence.serialize(record.daily_buyout_values, ';'),
Aux.persistence.serialize(record.bids_of_today:values(), ';'),
Aux.persistence.serialize(record.buyouts_of_today:values(), ';'),
}, '#')
end
function private.decode_item_records(data_string)
local item_records = {}
for _, record_string in Aux.persistence.deserialize(data_string, '|') do
local item_key, record = private.decode_item_record(record_string)
item_records[item_key] = record
end
return item_records
end
function private.decode_item_record(data_string)
local fields = Aux.persistence.deserialize(data_string, '#')
local bids_of_today = Aux.util.set()
bids_of_today:add_all(Aux.util.map(Aux.persistence.deserialize(fields[4], ';'), function(value)
return tonumber(value)
end))
local buyouts_of_today = Aux.util.set()
buyouts_of_today:add_all(Aux.util.map(Aux.persistence.deserialize(fields[5], ';'), function(value)
return tonumber(value)
end))
return fields[1], {
daily_bid_values = Aux.util.map(Aux.persistence.deserialize(fields[2], ';'), function(value)
return tonumber(value)
end),
-- auction count
-- latest_buyout_dailies
-- latest_bid_dailies
-- current_day_max_bid
-- current_day_buyout_histogram
histogram = Aux.util.map(Aux.persistence.deserialize(record[4], ';', 'x'), function(value)
daily_buyout_values = Aux.util.map(Aux.persistence.deserialize(fields[3], ';'), function(value)
return tonumber(value)
end),
bids_of_today = bids_of_today,
buyouts_of_today = buyouts_of_today,
}
end
function private.write_record(item_key, record)
local data = private.load_data()
data.item_data[item_key] = Aux.persistence.serialize({
record.auction_count,
record.day_count,
Aux.persistence.serialize(record.last_daily_values, ';'),
Aux.persistence.serialize(record.histogram, ';', 'x'),
},'#')
function public.on_login()
local dataset = Aux.persistence.load_dataset()
local fields = Aux.persistence.deserialize(dataset.history, '/')
next_push = tonumber(fields[1]) or time() + private.PUSH_INTERVAL
item_records = private.decode_item_records(fields[2])
end
function public.on_logout()
local dataset = Aux.persistence.load_dataset()
dataset.history = Aux.util.join({ next_push, private.encode_item_records(item_records) }, '/')
end
function private.new_item_record()
return { daily_bid_values = {}, daily_buyout_values = {}, bids_of_today = Aux.util.set(), buyouts_of_today = Aux.util.set() }
end
function public.process_auction(auction_info)
-- experimental
local unit_high_bid = auction_info.high_bid/auction_info.aux_quantity
aux_max_bids[auction_info.item_key] = max(aux_max_bids[auction_info.item_key] or 0, unit_high_bid)
if aux_max_bids[auction_info.item_key] > 0 then
snipe.log(auction_info.hyperlink..': '..Aux.money.to_string(aux_max_bids[auction_info.item_key]))
end
-- experimental
local snapshot = Aux.persistence.load_snapshot()
if not snapshot.contains(auction_info.signature) then
return
end
snapshot.add(auction_info.signature, auction_info.duration)
if auction_info.buyout_price == 0 then
return
end
local data = private.load_data()
if data.next_push < time() then
if next_push < time() then
private.push_data()
end
local buyout = auction_info.buyout_price / auction_info.aux_quantity
local item_record = private.read_record(auction_info.item_key)
item_record.auction_count = item_record.auction_count + 1
for i=1,225 do
item_record.histogram[i] = item_record.histogram[i] or 0
if buyout < 1.1 ^ i then
item_record.histogram[i] = item_record.histogram[i] + 1
break
end
if auction_info.high_bid > 0 then
item_records[auction_info.item_key] = item_records[auction_info.item_key] or private.new_item_record()
local bid = Aux.round(auction_info.high_bid / auction_info.aux_quantity)
item_records[auction_info.item_key].bids_of_today:add(bid)
end
private.write_record(auction_info.item_key, item_record)
if auction_info.buyout_price > 0 then
item_records[auction_info.item_key] = item_records[auction_info.item_key] or private.new_item_record()
local buyout = Aux.round(auction_info.buyout_price / auction_info.aux_quantity)
item_records[auction_info.item_key].buyouts_of_today:add(buyout)
end
end
function public.price_data(item_key)
local item_record = private.read_record(item_key)
return item_record.auction_count, item_record.day_count, private.daily_market_value(item_record.histogram), private.median(item_record.last_daily_values)
end
--function public.price_data(item_key)
-- local item_record = private.read_record(item_key)
-- return item_record.auction_count, item_record.day_count, private.daily_market_value(item_record.histogram), private.median(item_record.last_daily_values)
--end
function public.market_value(item_key)
local auction_count, day_count, daily_market_value, median = public.price_data(item_key)
local record = item_records[item_key]
if auction_count == 0 then
return nil
elseif day_count == 0 then
return daily_market_value
if not record then
return
end
if getn(record.daily_buyout_values) == 0 then
return private.daily_buyout_value(item_key)
else
return median
return private.median(record.daily_buyout_values)
end
end
function private.daily_market_value(histogram)
function private.daily_bid_value(item_key)
local prices = item_records[item_key].bids_of_today:values()
local auction_count = 0
for _, frequency in ipairs(histogram) do
auction_count = auction_count + frequency
if getn(prices) == 0 then
return
end
sort(prices, function(a,b) return b < a end)
local acc = 0
local cutoff = ceil(getn(prices) * 0.2)
for i=1,cutoff do
acc = acc + prices[i]
end
if auction_count == 0 then
return 0
end
-- average of lowest 25%
local sum, count = 0, 0
local limit = auction_count * 0.25
for i, frequency in ipairs(histogram) do
local limited_frequency = min(frequency, limit - count)
sum = sum + 1.1 ^ (i - 1) * 1.05 * limited_frequency
count = count + limited_frequency
if count >= limit then
break
end
end
return sum / limit
return acc / cutoff
end
function private.daily_buyout_value(item_key)
local prices = item_records[item_key].buyouts_of_today:values()
if getn(prices) == 0 then
return
end
sort(prices)
local acc = 0
local cutoff = ceil(getn(prices) * 0.2)
for i=1,cutoff do
acc = acc + prices[i]
end
return acc / cutoff
end
--function private.daily_market_value(histogram)
--
-- local auction_count = 0
-- for _, frequency in ipairs(histogram) do
-- auction_count = auction_count + frequency
-- end
--
-- if auction_count == 0 then
-- return 0
-- end
--
-- -- average of lowest 25%
-- local sum, count = 0, 0
-- local limit = auction_count * 0.25
-- for i, frequency in ipairs(histogram) do
-- local limited_frequency = min(frequency, limit - count)
-- sum = sum + 1.1 ^ (i - 1) * 1.05 * limited_frequency
-- count = count + limited_frequency
-- if count >= limit then
-- break
-- end
-- end
-- return sum / limit
--end
function private.median(list)
if getn(list) == 0 then
return
@@ -142,28 +186,28 @@ function private.median(list)
end
function private.push_data()
local data = private.load_data()
local item_data = data.item_data
for item_key, _ in pairs(item_data) do
for item_key, record in pairs(item_records) do
local item_record = private.read_record(item_key)
if getn(item_record.histogram) ~= 0 then
local daily_market_value = private.daily_market_value(item_record.histogram)
tinsert(item_record.last_daily_values, Aux.round(daily_market_value))
while getn(item_record.last_daily_values) > 11 do
tremove(item_record.last_daily_values, 1)
end
item_record.day_count = item_record.day_count + 1
item_record.histogram = {}
private.write_record(item_key, item_record)
local daily_bid_value = private.daily_bid_value(item_key)
if daily_bid_value then
tinsert(record.daily_bid_values, Aux.round(daily_bid_value))
end
while getn(record.daily_bid_values) > 11 do
tremove(record.daily_bid_values, 1)
end
record.bids_of_today = {}
local daily_buyout_value = private.daily_buyout_value(item_key)
if daily_buyout_value then
tinsert(record.daily_buyout_values, Aux.round(daily_buyout_value))
end
while getn(record.daily_buyout_values) > 11 do
tremove(record.daily_buyout_values, 1)
end
record.buyouts_of_today = {}
end
data.next_push = time() + private.PUSH_INTERVAL
next_push = time() + private.PUSH_INTERVAL
end
history.xml
+19
View File
@@ -0,0 +1,19 @@
<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/">
<Script file="history.lua"/>
<Frame>
<Scripts>
<OnLoad>
this:RegisterEvent('PLAYER_LOGIN')
this:RegisterEvent('PLAYER_LOGOUT')
</OnLoad>
<OnEvent>
if event == 'PLAYER_LOGIN' then
Aux.history.on_login()
elseif event == 'PLAYER_LOGOUT' then
Aux.history.on_logout()
end
</OnEvent>
</Scripts>
</Frame>
</Ui>
persistence.lua
+2 -55
View File
@@ -8,9 +8,6 @@ aux_database = {}
function public.on_load()
private.perform_migration(aux_database)
aux_database.version = DATABASE_VERSION
Aux.control.as_soon_as(function() return UnitFactionGroup('player') end, function()
public.load_snapshot().compact()
end)
end
function private.perform_migration()
@@ -29,13 +26,6 @@ function public.load_dataset()
return aux_database[dataset_key]
end
function public.load_snapshot()
local dataset = public.load_dataset()
dataset.snapshot = dataset.snapshot or {}
local snapshot = private.snapshot(dataset.snapshot)
return snapshot
end
function public.serialize(data, separator, compactor)
local data_string = ''
local i = 1
@@ -53,7 +43,7 @@ function public.serialize(data, separator, compactor)
end
function public.deserialize(data_string, separator, compactor)
if data_string == '' then
if not data_string or data_string == '' then
return {}
end
@@ -82,47 +72,4 @@ function public.deserialize(data_string, separator, compactor)
return data
end
end
end
function private.snapshot(data)
local self = {}
function self.add(signature, duration)
local HOUR = 60 * 60 * 60
local seconds
if duration == 1 then
seconds = HOUR / 2
elseif duration == 2 then
seconds = HOUR * 2
elseif duration == 3 then
seconds = HOUR * 8
elseif duration == 4 then
seconds = HOUR * 24
end
data[signature] = time() + seconds
end
function self.contains(signature)
return data[signature] ~= nil and data[signature] >= time()
end
function self.compact()
for signature, expiration in pairs(data) do
if expiration < time() then
data[signature] = nil
end
end
end
function self.signatures()
local signatures = {}
for signature, _ in pairs(data) do
if data[signature] >= time() then
tinsert(signatures, signature)
end
end
return signatures
end
return self
end
end
post_frame.lua
+1 -1
View File
@@ -53,7 +53,7 @@ function private.update_auction_listing()
{ value=Aux.auction_listing.time_left(auction_record.duration) },
{ value=stack_size },
{ value=Aux.money.to_string(auction_record.unit_buyout_price, true, nil, 3) },
{ value=Aux.auction_listing.percentage_market(market_value and Aux.round(auction_record.unit_buyout_price/market_value * 100) or '---') },
{ value=market_value and Aux.auction_listing.percentage_market(Aux.round(auction_record.unit_buyout_price / market_value * 100)) or '---' },
},
record = auction_record,
})
scan.lua
-2
View File
@@ -1,8 +1,6 @@
local private , public = {}, {}
Aux.scan = public
aux_max_bids = {}
local PAGE_SIZE = 50
local controller = (function()
scan_util.lua
+2 -2
View File
@@ -292,8 +292,8 @@ function m.validator(filter)
return
end
if filter.max_percent and (record.unit_buyout_price == 0
or not aux_max_bids
or record.unit_buyout_price / aux_max_bids[record.item_key] * 100 > filter.max_percent)
or not Aux.history.market_value(record.item_key)
or record.unit_buyout_price / Aux.history.market_value(record.item_key) * 100 > filter.max_percent)
then
return
end
slash.lua
+1 -4
View File
@@ -1,9 +1,6 @@
SLASH_AUX1 = '/aux'
function SlashCmdList.AUX(parameter)
if parameter == 'clear snapshot' then
Aux.persistence.load_dataset().snapshot = {}
Aux.log('Snapshot cleared.')
elseif parameter == 'clear history' then
if parameter == 'clear history' then
Aux.persistence.load_dataset().history = {}
Aux.log('History cleared.')
elseif parameter == 'clear' then
test.lua
-42
View File
@@ -1,48 +1,6 @@
local m = {}
Aux.test = m
--function m.intervals(frequencies, median)
-- local intervals = {}
-- for i=1,30 do
-- tinsert(intervals, {
-- index = i,
-- lower = median + 2 ^ (i-1),
-- upper = median + 2 ^ i,
-- value = 2 ^ i * 1.5,
-- frequency = frequencies[i]
-- })
-- end
--end
--
--function m.new_histogram(old_histogram, old_median, new_value)
--
-- local new_median
--
-- local new_histogram = {}
-- for _, interval in ipairs(m.intervals({}, new_median)) do
-- for _, old_interval in m.intervals(old_histogram, old_median) do
-- local share = m.share(old_interval, interval)
-- new_histogram[interval.index] = new_histogram[interval.index] and new_histogram[interval.index] + share or share
-- end
-- end
-- return new_histogram
--end
--
--function m.new_median(histogram, old_median)
--
--end
--
--function m.share(old_interval, new_interval)
-- local upper = min(old_interval.upper, new_interval.upper)
-- local lower = max(old_interval.lower, new_interval.lower)
-- if upper < lower then
-- return 0
-- else
-- return (upper - lower) / (old_interval.upper - old_interval.lower) * old_interval.frequency
-- end
--end
--StaticPopupDialogs["CANCEL_AUCTION"] = {
-- text = TEXT(CANCEL_AUCTION_CONFIRMATION),
-- button1 = TEXT(ACCEPT),
util.lua
+6 -6
View File
@@ -252,31 +252,31 @@ function Aux.util.set()
local data = {}
function self.add(value)
function self:add(value)
data[value] = true
end
function self.add_all(values)
function self:add_all(values)
for _, value in ipairs(values) do
self.add(value)
end
end
function self.remove(value)
function self:remove(value)
data[value] = nil
end
function self.remove_all(values)
function self:remove_all(values)
for _, value in ipairs(values) do
self.remove(value)
end
end
function self.contains(value)
function self:contains(value)
return data[value] ~= nil
end
function self.values()
function self:values()
local values = {}
for value, _ in pairs(data) do
tinsert(values, value)