Changeset 69 for geniuswebcore/geniusweb


Ignore:
Timestamp:
10/11/21 16:01:02 (3 years ago)
Author:
Wouter Pasman
Message:

Added MOPAC protocol. For GeniusWeb 2.0.3

Location:
geniuswebcore/geniusweb
Files:
22 added
2 edited

Legend:

Unmodified
Added
Removed
  • geniuswebcore/geniusweb/progress/ProgressTime.py

    r67 r69  
    5555
    5656        def getTerminationTime(self) -> datetime:
    57                 return datetime.fromtimestamp( int(datetime.timestamp(self._start)*1000) + self._duration);
     57                return datetime.fromtimestamp( (int(datetime.timestamp(self._start)*1000) + self._duration)/1000.);
    5858       
    5959
  • geniuswebcore/geniusweb/protocol/NegoSettings.py

    r67 r69  
    88
    99
    10 @JsonSubTypes( ["geniusweb.protocol.session.saop.SAOPSettings.SAOPSettings" ])
     10@JsonSubTypes( ["geniusweb.protocol.session.saop.SAOPSettings.SAOPSettings",
     11                        "geniusweb.protocol.session.mopac.MOPACSettings.MOPACSettings" ])
    1112@JsonTypeInfo(use = Id.NAME, include = As.WRAPPER_OBJECT)
    1213class NegoSettings(ABC):
Note: See TracChangeset for help on using the changeset viewer.