Indicator renaming

Hanyu666 · May 29, 2018 · 9d9fa7d · 9d9fa7d
1 parent d8f763c
commit 9d9fa7d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,8 @@ __pycache__/
 *.py[cod]
 *$py.class
 
+.DS_Store
+
 .idea/
 
 # C extensions

diff --git a/pymoo/configuration.py b/pymoo/configuration.py
@@ -1,6 +1,6 @@
 from pymoo.rand.impl.my_random_generator import MyRandomGenerator
 
+
 class Configuration:
     EPS = 1e-30
     rand = MyRandomGenerator()
-
diff --git a/pymoo/indicator/__init__.py → pymoo/indicators/__init__.py b/pymoo/indicator/__init__.py → pymoo/indicators/__init__.py
diff --git a/pymoo/indicator/hypervolume.py → pymoo/indicators/hypervolume.py b/pymoo/indicator/hypervolume.py → pymoo/indicators/hypervolume.py
@@ -1,13 +1,13 @@
 import numpy as np
-from pymoo.model.performance import Performance
+from pymoo.model.indicator import Indicator
 
 
 def hypervolume(F):
     pass
 
-class Hypervolume(Performance):
+class Hypervolume(Indicator):
     def __init__(self, reference_point):
-        Performance.__init__(self)
+        Indicator.__init__(self)
         self.reference_point = reference_point
 
     def _calc(self, F):

diff --git a/pymoo/indicator/igd.py → pymoo/indicators/igd.py b/pymoo/indicator/igd.py → pymoo/indicators/igd.py
@@ -1,12 +1,12 @@
 import numpy as np
 from scipy.spatial.distance import cdist
 
-from pymoo.model.performance import Performance
+from pymoo.model.indicator import Indicator
 
 
-class IGD(Performance):
+class IGD(Indicator):
     def __init__(self, true_front):
-        Performance.__init__(self)
+        Indicator.__init__(self)
         self.true_front = true_front
 
     def _calc(self, F):

diff --git a/pymoo/model/performance.py → pymoo/model/indicator.py b/pymoo/model/performance.py → pymoo/model/indicator.py
@@ -3,7 +3,7 @@
 import numpy as np
 
 
-class Performance:
+class Indicator:
 
     def __init__(self):
         self.default_if_empty = 0.0