merge with upstream

DGAC · May 14, 2024 · 7516a5f · 7516a5f
2 parents 76f17f2 + bea60c8
commit 7516a5f
Show file tree

Hide file tree

Showing 7 changed files with 1,261 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -4,10 +4,10 @@ This repository contains the Acropole model for aircraft fuel flow prediction an
 
 ## Easy Install
 
-For a trouble-free installation, create a dedicated anaconda environment is recommended :
+For a trouble-free installation, creating a dedicated anaconda environment is recommended :
 
 ```sh
-conda create -n acropole python=3.11 -c conda-forge
+conda create -n acropole python=3.12 -c conda-forge
 ```
 
 Activate the conda environment :

diff --git a/acropole/models/Dense_Acropole_FuelFlow_Scaling/fingerprint.pb b/acropole/models/Dense_Acropole_FuelFlow_Scaling/fingerprint.pb
@@ -0,0 +1 @@
+��˜������ֳ����v�����I �𞷲����(�ާ����2
diff --git a/acropole/models/Dense_Acropole_FuelFlow_Scaling/saved_model.pb b/acropole/models/Dense_Acropole_FuelFlow_Scaling/saved_model.pb
diff --git a/acropole/models/Dense_Acropole_FuelFlow_Scaling/variables/variables.data-00000-of-00001 b/acropole/models/Dense_Acropole_FuelFlow_Scaling/variables/variables.data-00000-of-00001
diff --git a/acropole/models/Dense_Acropole_FuelFlow_Scaling/variables/variables.index b/acropole/models/Dense_Acropole_FuelFlow_Scaling/variables/variables.index
diff --git a/examples/examples.ipynb b/examples/examples.ipynb
diff --git a/pyproject.toml b/pyproject.toml
@@ -18,8 +18,8 @@ joblib = ">=1.4"
 pandas = ">=2.2"
 scikit-learn = ">=1.4"
 numpy = ">=1.26"
-keras = ">3.0"
-tensorflow = ">=2.16"
+keras = "^3.3"
+tensorflow = "^2.16"
 
 
 [build-system]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		��˜��ֳ��v��I �𞷲��(�ާ��2