From 31ddb15476f000f922299ce5ff36638878643524 Mon Sep 17 00:00:00 2001
From: Samuel William Nehrer <nehrer.samuel@gmail.com>
Date: Mon, 29 Jan 2024 20:20:51 +0100
Subject: [PATCH] Resolving Conflicting Dependencies

---
 Project.toml           | 2 ++
 src/ActiveInference.jl | 2 +-
 src/maths.jl           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Project.toml b/Project.toml
index 305be52..e3d7278 100644
--- a/Project.toml
+++ b/Project.toml
@@ -5,9 +5,11 @@ version = "1.0.0-DEV"
 
 [deps]
 Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
+Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [compat]
 julia = "1"
diff --git a/src/ActiveInference.jl b/src/ActiveInference.jl
index 03b3aef..aed2771 100644
--- a/src/ActiveInference.jl
+++ b/src/ActiveInference.jl
@@ -11,7 +11,7 @@ export # maths.jl
        sample_category,
        softmax,
        spm_log_single,
-       entropy,
+       entropy_A,
        kl_divergence,
        get_joint_likelihood,
        dot_likelihood,
diff --git a/src/maths.jl b/src/maths.jl
index 5cdb320..2fc5d31 100644
--- a/src/maths.jl
+++ b/src/maths.jl
@@ -36,7 +36,7 @@ end
 
 
 """Function for Calculating Entropy of A-Matrix"""
-function entropy(A)
+function entropy_A(A)
     
     H_A = .- sum((A .* spm_log_single(A)), dims = 1)