Changeset 69 for geniuswebcore/test

Timestamp:

10/11/21 16:01:02 (3 years ago)

Author:

Wouter Pasman

Message:

Added MOPAC protocol. For GeniusWeb 2.0.3

Location:

geniuswebcore/test

Files:

• PriorityQueueTest.py (added)
• geniusweb/progress/ProgressTimeTest.py (modified) (1 diff)
• geniusweb/protocol/session/mopac (added)
• geniusweb/protocol/session/mopac/MOPACSettingsTest.py (added)
• geniusweb/protocol/session/mopac/MOPACStateTest.py (added)
• geniusweb/protocol/session/mopac/MOPACTest.py (added)
• geniusweb/protocol/session/mopac/PartyStatesTest.py (added)
• geniusweb/protocol/session/mopac/__init__.py (added)
• geniusweb/protocol/session/mopac/phase (added)
• geniusweb/protocol/session/mopac/phase/OfferPhaseTest.py (added)
• geniusweb/protocol/session/mopac/phase/OptInPhaseTest.py (added)
• geniusweb/protocol/session/mopac/phase/VotingPhaseTest.py (added)
• geniusweb/protocol/session/mopac/phase/__init__.py (added)
• geniusweb/simplerunner/SessionRunnerE2ETest.py (modified) (1 diff)
• geniusweb/voting (added)
• geniusweb/voting/CollectedVotesTest.py (added)
• geniusweb/voting/__init__.py (added)
• geniusweb/voting/votingevaluators (added)
• geniusweb/voting/votingevaluators/LargestAgreementTest.py (added)
• geniusweb/voting/votingevaluators/LargestAgreementsLoopTest.py (added)
• geniusweb/voting/votingevaluators/__init__.py (added)
• resources/mopac.json (modified) (1 diff)
• testparty/TestParty.py (modified) (5 diffs)

geniuswebcore/test/geniusweb/progress/ProgressTimeTest.py

@@ -41 +41 @@
         
     def testTerminationTime(self):
-        self.assertEqual(datetime.fromtimestamp(100000900+1999), self.progress.getTerminationTime())
+        self.assertEqual(datetime.fromtimestamp((100000900+1999)/1000), self.progress.getTerminationTime())
         
     def testGet(self):

geniuswebcore/test/geniusweb/simplerunner/SessionRunnerE2ETest.py

@@ -27 +27 @@
         params = ["test/resources/settings.json", 
 #                                "test/resources/settings2.json" ,          PARTIALORDERING NOT YET
-                                 "test/resources/settingsbadprofile.json"
+                                 "test/resources/settingsbadprofile.json",
 #                                "test/resources/shaoptoursettings.json",   ALLPERMUTATIONSETTINGS NOT YET
-#                                "test/resources/mopac.json" ,              MOPAC NOT YET
+                                 "test/resources/mopac.json"
 #                                "test/resources/tournament.json"                       ALLPERMUTATIONSETTINGS NOT YET
                                  ]

geniuswebcore/test/resources/mopac.json

@@ -4 +4 @@
                 {"TeamInfo":{"parties":[
                 {
-                        "party": {"partyref":"classpath:geniusweb.exampleparties.randomparty.RandomParty", "parameters":{"power":1}},
-                        "profile": "file:src/test/resources/jobs/jobs1.json"
+                        "party": {"partyref":"pythonpath:test.testparty.TestParty.TestParty", "parameters":{"power":1}},
+                        "profile": "file:test/resources/jobs/jobs1.json"
                 } ]}}, 
                 
                 {"TeamInfo":{"parties":[
                 {
-                        "party": {"partyref":"classpath:geniusweb.exampleparties.randomparty.RandomParty", "parameters":{"power":1}},
-                        "profile": "file:src/test/resources/jobs/jobs2.json"
+                        "party": {"partyref":"pythonpath:test.testparty.TestParty.TestParty", "parameters":{"power":1}},
+                        "profile": "file:test/resources/jobs/jobs2.json"
                 } ]}} ],
                 "deadline": {

geniuswebcore/test/testparty/TestParty.py

@@ -2 +2 @@
 import logging
 import sys
-from typing import Dict, Any
+from typing import Dict, Any, Set
 from typing import cast
 
@@ -9 +9 @@
 from geniusweb.actions.Offer import Offer
 from geniusweb.actions.PartyId import PartyId
+from geniusweb.actions.Vote import Vote
+from geniusweb.actions.Votes import Votes
 from geniusweb.inform.ActionDone import ActionDone
 from geniusweb.inform.Finished import Finished
 from geniusweb.inform.Inform import Inform
+from geniusweb.inform.OptIn import OptIn
 from geniusweb.inform.Settings import Settings
+from geniusweb.inform.Voting import Voting
 from geniusweb.inform.YourTurn import YourTurn
 from geniusweb.issuevalue.Bid import Bid
@@ -35 +39 @@
         #self.getReporter().log(logging.INFO,"received info:"+str(info))
         if isinstance(info,Settings) :
-            settings:Settings=cast(Settings,info)    
-            self._me = settings.getID()
-            self._protocol = settings.getProtocol()
+            self._settings:Settings=cast(Settings,info)    
+            self._me = self._settings.getID()
+            self._protocol = self._settings.getProtocol()
         elif isinstance(info, ActionDone):
             action:Action=cast( ActionDone,info).getAction()
@@ -54 +58 @@
                 val(self.getConnection()).send(offer)
                 self.getReporter().log(logging.INFO,"sent empty offer:")
+        elif isinstance(info, Voting):
+            # MOPAC protocol
+            self._lastvotes = self._vote(cast(Voting, info));
+            val(self.getConnection()).send(self._lastvotes)
+        elif isinstance(info, OptIn):
+            val(self.getConnection()).send(self._lastvotes)
+
         elif isinstance(info, Finished):
             self.terminate()
@@ -76 +87 @@
             self._profile = None
 
+    def _vote(self, voting:Voting) ->Votes :
+        '''
+        @param voting the {@link Voting} object containing the options
+        
+        @return our next Votes. Stupid: vote for all received offers.
+        '''
+        votes:Set[Vote]  = set([Vote(self._me, offer.getBid(), 2, 5)\
+                for offer in voting.getOffers() ])
+        return Votes(self._me, votes)