From 2ca62311c22e493a04888a6ab2018654a4db053d Mon Sep 17 00:00:00 2001
From: David Parsons <david.parsons@inria.fr>
Date: Fri, 7 Apr 2023 16:29:02 +0200
Subject: [PATCH] remove dubious Fuzzy save/load
---
src/libaevol/7/fuzzy/AbstractFuzzy_7.h | 2 --
.../7/fuzzy/Discrete_Double_Fuzzy.cpp | 4 ---
src/libaevol/7/fuzzy/Discrete_Double_Fuzzy.h | 2 --
src/libaevol/7/fuzzy/Vector_Fuzzy.cpp | 25 -------------------
src/libaevol/7/fuzzy/Vector_Fuzzy.h | 2 --
5 files changed, 35 deletions(-)
diff --git a/src/libaevol/7/fuzzy/AbstractFuzzy_7.h b/src/libaevol/7/fuzzy/AbstractFuzzy_7.h
index 679761351..693851719 100644
--- a/src/libaevol/7/fuzzy/AbstractFuzzy_7.h
+++ b/src/libaevol/7/fuzzy/AbstractFuzzy_7.h
@@ -52,8 +52,6 @@ class AbstractFuzzy_7
// ==========================================================================
// Public Methods
// ==========================================================================
- virtual void save(gzFile backup) const = 0;
- virtual void load(gzFile backup) = 0;
virtual void reset() = 0;
virtual void simplify() = 0;
virtual void add_triangle(ProteinConcentration mean, ProteinConcentration width, ProteinConcentration height, bool verbose = false) = 0;
diff --git a/src/libaevol/7/fuzzy/Discrete_Double_Fuzzy.cpp b/src/libaevol/7/fuzzy/Discrete_Double_Fuzzy.cpp
index 4a1314deb..1dfad8705 100644
--- a/src/libaevol/7/fuzzy/Discrete_Double_Fuzzy.cpp
+++ b/src/libaevol/7/fuzzy/Discrete_Double_Fuzzy.cpp
@@ -268,10 +268,6 @@ bool Discrete_Double_Fuzzy::is_identical_to(
assert(false);
}
-void Discrete_Double_Fuzzy::save(gzFile) const { assert(false); }
-
-void Discrete_Double_Fuzzy::load(gzFile) { assert(false); }
-
/// Set all points ordinate to 0
///
// TODO <david.parsons@inria.fr> Not sure if it's useful.
diff --git a/src/libaevol/7/fuzzy/Discrete_Double_Fuzzy.h b/src/libaevol/7/fuzzy/Discrete_Double_Fuzzy.h
index 74b1c3967..bcc011ac8 100644
--- a/src/libaevol/7/fuzzy/Discrete_Double_Fuzzy.h
+++ b/src/libaevol/7/fuzzy/Discrete_Double_Fuzzy.h
@@ -92,8 +92,6 @@ class Discrete_Double_Fuzzy : public AbstractFuzzy_7
// ==========================================================================
// Public Methods
// ==========================================================================
- void save(gzFile backup) const override;
- void load(gzFile backup) override;
void reset() override;
void simplify() override;
void add_triangle(ProteinConcentration mean,
diff --git a/src/libaevol/7/fuzzy/Vector_Fuzzy.cpp b/src/libaevol/7/fuzzy/Vector_Fuzzy.cpp
index ec3669970..5073ba68a 100644
--- a/src/libaevol/7/fuzzy/Vector_Fuzzy.cpp
+++ b/src/libaevol/7/fuzzy/Vector_Fuzzy.cpp
@@ -416,31 +416,6 @@ bool Vector_Fuzzy::is_identical_to(const AbstractFuzzy_7& f, ProteinConcentratio
return true;
}
-
-void Vector_Fuzzy::save(gzFile backup_file) const {
- int16_t nb_points = points_.size();
- gzwrite(backup_file, &nb_points, sizeof(nb_points));
- cout << __FILE__ << ":" << __LINE__ << ":" << gztell(backup_file) << endl;
- cout << __FILE__ << ":" << __LINE__ << ":" << nb_points << endl;
-
- for (const Point& p : points_)
- writepoint(p, backup_file);
-}
-
-
-void Vector_Fuzzy::load(gzFile backup_file) {
- // assert(invariant());
-
- int16_t nb_points;
- gzread(backup_file, &nb_points, sizeof(nb_points));
- cout << __FILE__ << ":" << __LINE__ << ":" << gztell(backup_file) << endl;
- cout << __FILE__ << ":" << __LINE__ << ":" << nb_points << endl;
- for (int16_t i = 0 ; i < nb_points ; i++)
- points_.insert(Point(readpoint(backup_file)));
-
- // assert(invariant());
-}
-
set<Point>::iterator Vector_Fuzzy::create_interpolated_point(ProteinConcentration x, bool verbose) {
set<Point>::iterator p2 = points_.lower_bound(Point(x,0.0));
if (p2 != points_.begin()) p2 = prev(p2);
diff --git a/src/libaevol/7/fuzzy/Vector_Fuzzy.h b/src/libaevol/7/fuzzy/Vector_Fuzzy.h
index 5b8c221eb..fb75f69cd 100644
--- a/src/libaevol/7/fuzzy/Vector_Fuzzy.h
+++ b/src/libaevol/7/fuzzy/Vector_Fuzzy.h
@@ -91,8 +91,6 @@ class Vector_Fuzzy : public AbstractFuzzy_7
// ==========================================================================
// Public Methods
// ==========================================================================
- void save(gzFile backup) const override;
- void load(gzFile backup) override;
void reset() override;
void simplify() override;
void add_triangle(ProteinConcentration mean,
--
GitLab