Changeset 21 for boa


Ignore:
Timestamp:
09/22/20 08:52:04 (4 years ago)
Author:
bart
Message:

Version 1.5.

Location:
boa
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • boa/pom.xml

    r20 r21  
    66        <groupId>geniusweb</groupId>
    77        <artifactId>boa</artifactId>
    8         <version>1.4.4</version> <!-- must equal ${geniusweb.version} -->
     8        <version>1.5.0</version> <!-- must equal ${geniusweb.version} -->
    99        <packaging>jar</packaging>
    1010
    … …  
    1717                <passwd>${env.ARTIFACTORY_PASS}</passwd>
    1818                <jackson-2-version>2.9.10</jackson-2-version>
    19                 <geniusweb.version>1.4.4</geniusweb.version>
     19                <geniusweb.version>1.5.0</geniusweb.version>
    2020        </properties>
    2121

  • boa/src/main/java/geniusweb/boa/BoaParty.java

    r20 r21  
    66import geniusweb.boa.acceptancestrategy.AcceptanceStrategy;
    77import geniusweb.boa.biddingstrategy.BiddingStrategy;
     8import geniusweb.inform.Settings;
    89import geniusweb.opponentmodel.OpponentModel;
    9 import geniusweb.party.inform.Settings;
    1010import tudelft.utilities.logging.Reporter;
    1111

  • boa/src/main/java/geniusweb/boa/BoaState.java

    r20 r21  
    1212import geniusweb.boa.acceptancestrategy.AcceptanceStrategy;
    1313import geniusweb.boa.biddingstrategy.BiddingStrategy;
     14import geniusweb.inform.Settings;
    1415import geniusweb.issuevalue.Bid;
    1516import geniusweb.opponentmodel.OpponentModel;
    16 import geniusweb.party.inform.Settings;
    1717import geniusweb.profile.Profile;
    1818import geniusweb.progress.Progress;

  • boa/src/main/java/geniusweb/boa/DefaultBoa.java

    r20 r21  
    1111import geniusweb.boa.acceptancestrategy.AcceptanceStrategy;
    1212import geniusweb.boa.biddingstrategy.BiddingStrategy;
     13import geniusweb.inform.ActionDone;
     14import geniusweb.inform.Finished;
     15import geniusweb.inform.Inform;
     16import geniusweb.inform.Settings;
     17import geniusweb.inform.YourTurn;
    1318import geniusweb.issuevalue.Bid;
    1419import geniusweb.opponentmodel.OpponentModel;
    1520import geniusweb.party.Capabilities;
    1621import geniusweb.party.DefaultParty;
    17 import geniusweb.party.inform.ActionDone;
    18 import geniusweb.party.inform.Finished;
    19 import geniusweb.party.inform.Inform;
    20 import geniusweb.party.inform.Settings;
    21 import geniusweb.party.inform.YourTurn;
    2222import geniusweb.profileconnection.ProfileConnectionFactory;
    2323import geniusweb.profileconnection.ProfileInterface;

  • boa/src/main/java/geniusweb/boa/acceptancestrategy/AcceptanceStrategy.java

    r20 r21  
    33import geniusweb.boa.BoaParty;
    44import geniusweb.boa.BoaState;
     5import geniusweb.inform.Settings;
    56import geniusweb.issuevalue.Bid;
    6 import geniusweb.party.inform.Settings;
    77
    88/**

  • boa/src/main/java/geniusweb/boa/acceptancestrategy/TimeDependentAcceptanceStrategy.java

    r20 r21  
    66import geniusweb.boa.BoaState;
    77import geniusweb.boa.biddingstrategy.TimeDependentBiddingStrategy;
     8import geniusweb.inform.Settings;
    89import geniusweb.issuevalue.Bid;
    9 import geniusweb.party.inform.Settings;
    1010import geniusweb.profile.Profile;
    1111import geniusweb.profile.utilityspace.LinearAdditive;

  • boa/src/main/java/geniusweb/boa/biddingstrategy/BiddingStrategy.java

    r20 r21  
    44import geniusweb.boa.BoaParty;
    55import geniusweb.boa.BoaState;
    6 import geniusweb.party.inform.Settings;
     6import geniusweb.inform.Settings;
    77
    88/**

  • boa/src/main/java/geniusweb/boa/biddingstrategy/TimeDependentBiddingStrategy.java

    r20 r21  
    1313import geniusweb.actions.PartyId;
    1414import geniusweb.boa.BoaState;
     15import geniusweb.inform.Settings;
    1516import geniusweb.issuevalue.Bid;
    16 import geniusweb.party.inform.Settings;
    1717import geniusweb.profile.Profile;
    1818import geniusweb.profile.utilityspace.LinearAdditive;

  • boa/src/test/java/geniusweb/boa/BoaPartyTest.java

    r20 r21  
    2424import geniusweb.boa.biddingstrategy.BiddingStrategy;
    2525import geniusweb.connection.ConnectionEnd;
     26import geniusweb.inform.ActionDone;
     27import geniusweb.inform.Inform;
     28import geniusweb.inform.Settings;
     29import geniusweb.inform.YourTurn;
    2630import geniusweb.issuevalue.Bid;
    2731import geniusweb.issuevalue.DiscreteValue;
    2832import geniusweb.issuevalue.Domain;
    2933import geniusweb.opponentmodel.OpponentModel;
    30 import geniusweb.party.inform.ActionDone;
    31 import geniusweb.party.inform.Inform;
    32 import geniusweb.party.inform.Settings;
    33 import geniusweb.party.inform.YourTurn;
    3434import geniusweb.progress.Progress;
    3535import geniusweb.references.Parameters;

  • boa/src/test/java/geniusweb/boa/acceptancestrategy/TimeDepAccStratTest.java

    r20 r21  
    1616import geniusweb.bidspace.Interval;
    1717import geniusweb.boa.BoaState;
     18import geniusweb.inform.Settings;
    1819import geniusweb.issuevalue.Bid;
    19 import geniusweb.party.inform.Settings;
    2020import geniusweb.profile.Profile;
    2121import geniusweb.profile.utilityspace.LinearAdditive;
    … …  
    4646
    4747                TimeDependentAcceptanceStrategy ac = new TimeDependentAcceptanceStrategy() {
     48                        @Override
    4849                        protected BidsWithUtility getBidspace(Profile profile) {
    4950                                return testbidspace;
    … …  
    5253                // we use default e=1, k=0 which means p(0)=1
    5354
    54                 when(progress.get(any())).thenReturn((Double) 0.0d);
     55                when(progress.get(any())).thenReturn(0.0d);
    5556
    5657                when(linearprofile.getUtility(eq(bid1)))
    … …  
    6768
    6869                TimeDependentAcceptanceStrategy ac = new TimeDependentAcceptanceStrategy() {
     70                        @Override
    6971                        protected BidsWithUtility getBidspace(Profile profile) {
    7072                                return testbidspace;
    … …  
    7375                // we use default e=1, k=0 which means p(0)=1
    7476
    75                 when(progress.get(any())).thenReturn((Double) 0.0d);
     77                when(progress.get(any())).thenReturn(0.0d);
    7678
    7779                when(linearprofile.getUtility(eq(bid1)))
    … …  
    8789
    8890                TimeDependentAcceptanceStrategy ac = new TimeDependentAcceptanceStrategy() {
     91                        @Override
    8992                        protected BidsWithUtility getBidspace(Profile profile) {
    9093                                return testbidspace;
    … …  
    9396                // we use default e=1, k=0 which means p(1)=0
    9497
    95                 when(progress.get(any())).thenReturn((Double) 1.0d);
     98                when(progress.get(any())).thenReturn(1.0d);
    9699
    97100                when(linearprofile.getUtility(eq(bid1)))
    … …  
    110113
    111114                TimeDependentAcceptanceStrategy ac = new TimeDependentAcceptanceStrategy() {
     115                        @Override
    112116                        protected BidsWithUtility getBidspace(Profile profile) {
    113117                                return testbidspace;
    … …  
    116120                // we use default e=1, k=0 which means p(1)=resValue.
    117121
    118                 when(progress.get(any())).thenReturn((Double) 1.0d);
     122                when(progress.get(any())).thenReturn(1.0d);
    119123
    120124                when(linearprofile.getUtility(eq(bid1)))

  • boa/src/test/java/geniusweb/boa/biddingstrategy/TimeDepBidStratTest.java

    r20 r21  
    1717import geniusweb.actions.Offer;
    1818import geniusweb.boa.BoaState;
     19import geniusweb.inform.Settings;
    1920import geniusweb.issuevalue.Bid;
    2021import geniusweb.issuevalue.DiscreteValue;
    21 import geniusweb.party.inform.Settings;
    2222import geniusweb.profile.utilityspace.LinearAdditive;
    2323import geniusweb.progress.Progress;
    … …  
    4646
    4747                biddingstrat = new TimeDependentBiddingStrategy() {
     48                        @Override
    4849                        protected ExtendedUtilSpace getBidSpace(LinearAdditive profile) {
    4950                                return extUtilSpace;
Note: See TracChangeset for help on using the changeset viewer.