Merge pull request #933 from arcondello/fix/AdjVectorBQM.to_file

Fix `AdjVectorBQM.to_file` and `AdjVectorBQM.from_file`

dimod/bqm/adjvectorbqm.pyx

@@ -592,8 +592,12 @@ cdef class cyAdjVectorBQM:
             :func:`~dimod.serialization.fileview.load`
 
         """
+        # this is not very efficient, but since AdjVectorBQM is deprecated
+        # simplicity trumps performance.
         from dimod.serialization.fileview import load
-        return load(file_like, cls=cls)
+        obj = cls.__new__(cls)
+        obj._init_bqm(load(file_like))
+        return obj
 
     @classmethod
     @cython.boundscheck(False)
@@ -1001,7 +1005,7 @@ cdef class cyAdjVectorBQM:
 
         self.bqm_.set_quadratic(ui, vi, b)
 
-    def to_file(self):
+    def to_file(self, *args, **kwargs):
         """View the BQM as a file-like object.
 
         See also:
@@ -1012,8 +1016,12 @@ cdef class cyAdjVectorBQM:
             :func:`~dimod.serialization.fileview.FileView`
 
         """
-        from dimod.serialization.fileview import FileView
-        return FileView(self)
+        # this is not very efficient, but since AdjVectorBQM is deprecated
+        # simplicity trumps performance.
+        # technically it will mis-mark the __type__ in the header, but
+        # since we ignore that on deserialization, it doesn't matter
+        from dimod.binary.binary_quadratic_model import BQM
+        return BQM(self, dtype=np.float64).to_file(*args, **kwargs)
 
     @cython.boundscheck(False)
     @cython.wraparound(False)

releasenotes/notes/fix-adjvector-to-file-8e56711f5d4a4233.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix (deprecated) ``AdjVectorBQM.to_file`` and ``AdjVectorBQM.from_file``.
+    See `#898 <https://github.com/dwavesystems/dimod/issues/898>`_.

tests/test_adjvectorbqm.py

@@ -0,0 +1,44 @@
+# Copyright 2019 D-Wave Systems Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+import shutil
+import tempfile
+import unittest
+
+import dimod
+
+
+class TestFileView(unittest.TestCase):
+    def test_empty(self):
+        bqm = dimod.AdjVectorBQM('SPIN', _ignore_warning=True)
+
+        with tempfile.TemporaryFile() as tf:
+            with bqm.to_file() as bqmf:
+                shutil.copyfileobj(bqmf, tf)
+            tf.seek(0)
+            new = dimod.AdjVectorBQM.from_file(tf)
+
+        self.assertEqual(bqm, new)
+
+    def test_2path(self):
+        bqm = dimod.AdjVectorBQM([.1, -.2], [[0, -1], [0, 0]], 'SPIN',
+                                 _ignore_warning=True)
+
+        with tempfile.TemporaryFile() as tf:
+            with bqm.to_file() as bqmf:
+                shutil.copyfileobj(bqmf, tf)
+            tf.seek(0)
+            new = dimod.AdjVectorBQM.from_file(tf)
+
+        self.assertEqual(bqm, new)