From 7e6c98250f5753ad559a236ed0ffec317fd19007 Mon Sep 17 00:00:00 2001
From: "O'Keefe, Colin B" <cbokeefe@hrl.com>
Date: Tue, 9 Apr 2024 09:56:05 -0700
Subject: [PATCH] updated to use clos-encounters

---
 qvm.asd                     | 2 +-
 src/error/fowler-noise.lisp | 3 ++-
 src/error/package.lisp      | 2 +-
 src/package.lisp            | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/qvm.asd b/qvm.asd
index d1021ff3..d8606406 100644
--- a/qvm.asd
+++ b/qvm.asd
@@ -17,7 +17,7 @@
                ;; General utilities
                #:alexandria
                ;; Abstract classes
-               #:org.tfeb.hax.abstract-classes
+               #:clos-encounters
                ;; IEEE-754 float parsing
                #:ieee-floats
                ;; Parallelization utilities
diff --git a/src/error/fowler-noise.lisp b/src/error/fowler-noise.lisp
index 97609e77..1083f9c7 100644
--- a/src/error/fowler-noise.lisp
+++ b/src/error/fowler-noise.lisp
@@ -22,7 +22,7 @@ HIGH |    4    |   3   |  2 |  1 |   0  | LOW
      | READOUT | RESET | 2Q | 1Q | IDLE |"
   '(unsigned-byte 5))
 
-(define-abstract-class fowler-qvm ()
+(defclass fowler-qvm ()
   ((noise-probability
     :initarg :noise-probability
     :accessor fowler-qvm-noise-probability
@@ -34,6 +34,7 @@ HIGH |    4    |   3   |  2 |  1 |   0  | LOW
     :accessor fowler-qvm-noise-class
     :type fowler-noise
     :documentation "Noise events of class <= NOISE-CLASS will be applied."))
+  (:metaclass abstract-class)
   (:documentation "A quantum virtual machine with noise as specified on page 11 of /1208.0928.
 
 This noise model carries a set of flags that select certain subsets of operations (see `FOWLER-NOISE').  When a flag is set, this noise model applies spatially-uniform depolarizing noise to the corresponding operations.")
diff --git a/src/error/package.lisp b/src/error/package.lisp
index 36507dd2..4886268d 100644
--- a/src/error/package.lisp
+++ b/src/error/package.lisp
@@ -5,7 +5,7 @@
 
 (defpackage #:qvm.error
   (:use #:cl
-        #:org.tfeb.hax.abstract-classes
+        #:clos-encounters
         #:qvm)
   (:import-from #:qvm #:multiprobabilistically)
   (:local-nicknames (#:quil     #:cl-quil.frontend))
diff --git a/src/package.lisp b/src/package.lisp
index 8a924de8..6e153ee0 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -5,7 +5,7 @@
 (defpackage #:qvm
   (:documentation "Package containing an implementation of a quantum virtual machine.")
   (:use #:cl
-        #:org.tfeb.hax.abstract-classes)
+        #:clos-encounters)
 
   (:shadowing-import-from #:mt19937
                           #:random)