go fmt, with some syntax fixes

This commit is contained in:
Kistaro Windrider 2023-11-18 16:27:21 -08:00
parent 0c30e880cc
commit 88737d8f4c
Signed by: kistaro
SSH Key Fingerprint: SHA256:TBE2ynfmJqsAf0CP6gsflA0q5X5wD5fVKWPsZ7eVUg8
4 changed files with 41 additions and 42 deletions

View File

@ -9,7 +9,7 @@ import (
* RunAuction simulates a single-bid second-price auction with no reserve price
* between all bidders emitted by the provided generator, returning the winning
* bidder and how much they paid (the maximum bid of the second-highest bidder).
*
*
* To simulate an auction between the first several bidders emitted by some
* generator, use CappedBidderGenerator (in generators.go).
*/
@ -29,17 +29,16 @@ func RunAuction(g BidderGenerator) (float64, Bidder) {
return prevBid, highBidder
}
/**
* RunAuctionVerbosely simulates a single-bid second-price auction with no
* reserve price between all bidders emitted by the provided generator,
* reserve price between all bidders emitted by the provided generator,
* returning all bidders sorted by the order they dropped out and how much the
* winning bidder paid.
*
* Use CappedBidderGenerator to limit the size of the auction and therefore
* the number of bidders on the list.
*/
func RunAuctionVerbosely(g BidderGenerator) float64, []Bidder {
func RunAuctionVerbosely(g BidderGenerator) (float64, []Bidder) {
var bidders []Bidder
for b, ok := g.Generate(); ok; b, ok = g.Generate() {
bidders = append(bidders, b)

View File

@ -5,25 +5,25 @@ package auctionsim
* not threadsafe. It is a pure value type.
*/
type Bidder struct {
/**
* Value stores the real value of the item being auctioned, to this bidder.
* If the bidder won the auction at this price, they would make exactly
* zero effective profit. It is the "rational bid" in a perfectly efficient
* marketplace.
*
* A bidder that wants some nonzero profit has a lower value on the item by
* the amount of profit they want -- that "minimum payoff" represents an
* unspecified cost for the time and effort of doing the project at all.
* Other costs for getting value out of the object also decrease its value.
*
* For example, a city to which hosting an F1 race is worth five billion
* dollars, but would spend three and a half billion dollars setting up for
* it, one billion dollars running it, and lose one billion dollars of tax
* revenue due to business disruption during setup and during the event,
* correctly values the race for negative five hundred million dollars. As
* demonstrated by this example, a value can be negative.
*
*/
/**
* Value stores the real value of the item being auctioned, to this bidder.
* If the bidder won the auction at this price, they would make exactly
* zero effective profit. It is the "rational bid" in a perfectly efficient
* marketplace.
*
* A bidder that wants some nonzero profit has a lower value on the item by
* the amount of profit they want -- that "minimum payoff" represents an
* unspecified cost for the time and effort of doing the project at all.
* Other costs for getting value out of the object also decrease its value.
*
* For example, a city to which hosting an F1 race is worth five billion
* dollars, but would spend three and a half billion dollars setting up for
* it, one billion dollars running it, and lose one billion dollars of tax
* revenue due to business disruption during setup and during the event,
* correctly values the race for negative five hundred million dollars. As
* demonstrated by this example, a value can be negative.
*
*/
Value float64
/**
@ -44,7 +44,7 @@ type Bidder struct {
*
* To simulate an auction without cash limits, set this to positive infinity
* for every bidder.
*
*
* A bidder's available cash can be negative. For example, a company that
* cannot offer a bid to perform a job below a certain price has negative
* effective cash on hand repersenting the maximum price they may "pay"
@ -79,7 +79,7 @@ func (b Bidder) BidCeiling() float64 {
* than their calculated ceiling if they had the money to do so, but they don't.
*/
func (b Bidder) CashCapped() bool {
return b.ValueBelief() > b.Cash;
return b.ValueBelief() > b.Cash
}
/**

View File

@ -10,9 +10,9 @@ import (
*/
func NormalestDistribution() *NormalDistribution {
return &NormalDistribution{
Rand: rand.New(rand.NewSource(int64(rand.Uint64()))),
Rand: rand.New(rand.NewSource(int64(rand.Uint64()))),
StdDev: 1,
Mean: 0,
Mean: 0,
}
}
@ -24,8 +24,8 @@ func NormalestDistribution() *NormalDistribution {
func NormalestBidderGenerator() BidderGenerator {
d := NormalestDistribution()
return &BiddersFromDistributions{
Values: d,
Values: d,
Irrationalities: d,
Bankrolls: ConstDistribution(math.Inf(1)),
Bankrolls: ConstDistribution(math.Inf(1)),
}
}

View File

@ -12,7 +12,7 @@ type Distribution interface {
* Draw returns the next float64 from the distribution and true, or
* zero and false if the distribution is exhausted or otherwise unusable.
*/
Draw() float64, bool
Draw() (float64, bool)
}
/**
@ -23,7 +23,7 @@ type BidderGenerator interface {
* Generate returns the next Bidder and true, or a zero Bidder and false if
* the generator is exhausted or otherwise unusable.
*/
Generate() Bidder, bool
Generate() (Bidder, bool)
}
/**
@ -31,9 +31,9 @@ type BidderGenerator interface {
* irrationality levels, and cash on hand from the provided distributions.
*/
type BiddersFromDistributions struct {
Values Distribution
Values Distribution
Irrationalities Distribution
Bankrolls Distribution
Bankrolls Distribution
}
/**
@ -53,10 +53,10 @@ func (b *BiddersFromDistributions) Generate() (Bidder, bool) {
return Bidder{}, false
}
return Bidder {
Value: value,
return Bidder{
Value: value,
Irrationality: irrationality,
Cash: cash,
Cash: cash,
}, true
}
@ -67,16 +67,16 @@ func (b *BiddersFromDistributions) Generate() (Bidder, bool) {
* (since rand.Rand is not threadsafe).
*/
type NormalDistribution struct {
Rand *rand.Rand
Rand *rand.Rand
StdDev float64
Mean float64
Mean float64
}
/**
* Draw implements Distribution.
*/
func (n *NormalDistribution) Draw() (float64, bool) {
return n.Rand.NormFloat64() * n.StdDev + n.Mean, true
return n.Rand.NormFloat64()*n.StdDev + n.Mean, true
}
/**
@ -88,7 +88,7 @@ type ConstDistribution float64
* Draw implements Distribution.
*/
func (c ConstDistribution) Draw() (float64, bool) {
return (float64)c, true
return float64(c), true
}
/**
@ -96,7 +96,7 @@ func (c ConstDistribution) Draw() (float64, bool) {
* then stops returning values.
*/
type CappedDistribution struct {
D Distribution
D Distribution
Lim int64
}
@ -116,7 +116,7 @@ func (c *CappedDistribution) Draw() (float64, bool) {
* BidderGenerator, then stops returning values.
*/
type CappedBidderGenerator struct {
G BidderGenerator
G BidderGenerator
Lim int64
}