Update core.py (#220)

src/common/core.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python 
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2022 Modelon AB
+# Copyright (C) 2010-2024 Modelon AB
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -149,7 +149,7 @@ def _exec_algorithm(self, module, algorithm, options):
             Exception if algorithm is not a subclass of 
             common.algorithm_drivers.AlgorithmBase.
         """
-        from pyfmi.algorithm_drivers import AlgorithmBase
+        from pyfmi.common.algorithm_drivers import AlgorithmBase
 
         if isinstance(algorithm, str):
             module = __import__(module, globals(), locals(), [algorithm], 0)
@@ -182,7 +182,7 @@ def _exec_simulate_algorithm(self,
             Exception if algorithm is not a subclass of 
             common.algorithm_drivers.AlgorithmBase.
         """
-        from pyfmi.algorithm_drivers import AlgorithmBase
+        from pyfmi.common.algorithm_drivers import AlgorithmBase
 
         if isinstance(algorithm, str):
             module = __import__(module, globals(), locals(), [algorithm], 0)

src/pyfmi/master.pyx

@@ -34,7 +34,7 @@ import scipy.optimize as spopt
 
 import pyfmi.fmi as fmi
 from pyfmi.common.algorithm_drivers import OptionBase, InvalidAlgorithmOptionException, AssimuloSimResult
-from pyfmi.common.io import ResultHandlerFile, ResultHandlerDummy, ResultHandlerBinaryFile
+from pyfmi.common.io import get_result_handler
 from pyfmi.common.core import TrajectoryLinearInterpolation, TrajectoryUserFunction
 from pyfmi.fmi cimport FMUModelCS2
 cimport fmil_import as FMIL

tests/test_fmi_master.py

@@ -22,6 +22,7 @@
 from pyfmi import testattr, Master
 from pyfmi.fmi import FMUException, FMUModelCS2, FMUModelME2
 from pyfmi.tests.test_util import Dummy_FMUModelCS2
+from pyfmi.common.io import ResultHandler
 from pyfmi.common.algorithm_drivers import UnrecognizedOptionError
 
 file_path = os.path.dirname(os.path.abspath(__file__))
@@ -265,8 +266,8 @@ def get_result(self):
 
         res = master.simulate(options=opts)
 
-        assert res[models[0]]._result_data == None, "Result is not none"
-        assert res[models[1]]._result_data == None, "Result is not none"
+        assert res[models[0]]._result_data is None, "Result is not none"
+        assert res[models[1]]._result_data is None, "Result is not none"
 
     @testattr(stddist = True)
     def test_basic_simulation_with_block_initialization(self):