Changes in src/Makefile.am [a4e9bb:6e7147]

File:

• src/Makefile.am (modified) (8 diffs)

src/Makefile.am

@@ -82 +82 @@
   Exceptions/MathException.cpp \
   Exceptions/NotInvertibleException.cpp \
-  Exceptions/NotOnSurfaceException.cpp \
-  Exceptions/ShapeException.cpp \
+  Exceptions/ParseError.cpp \
   Exceptions/SkewException.cpp \
   Exceptions/ZeroVectorException.cpp
@@ -92 +91 @@
   Exceptions/MathException.hpp \
   Exceptions/NotInvertibleException.hpp \
-  Exceptions/NotOnSurfaceException.hpp \
-  Exceptions/ShapeException.hpp \
+  Exceptions/ParseError.hpp \
   Exceptions/SkewException.hpp \
   Exceptions/ZeroVectorException.hpp
@@ -151 +149 @@
   Descriptors/AtomIdDescriptor.cpp \
   Descriptors/AtomSelectionDescriptor.cpp \
-  Descriptors/AtomShapeDescriptor.cpp \
   Descriptors/AtomTypeDescriptor.cpp \
   Descriptors/MoleculeDescriptor.cpp \
+  Descriptors/MoleculeFormulaDescriptor.cpp \
   Descriptors/MoleculeIdDescriptor.cpp \
   Descriptors/MoleculeNameDescriptor.cpp \
@@ -163 +161 @@
   Descriptors/AtomIdDescriptor.hpp \
   Descriptors/AtomSelectionDescriptor.hpp \
-  Descriptors/AtomShapeDescriptor.hpp \
   Descriptors/AtomTypeDescriptor.hpp \
   Descriptors/MoleculeDescriptor.hpp \
+  Descriptors/MoleculeFormulaDescriptor.hpp \
   Descriptors/MoleculeIdDescriptor.hpp \
   Descriptors/MoleculeNameDescriptor.hpp \
@@ -206 +204 @@
   ellipsoid.cpp \
   errorlogger.cpp \
+  Formula.cpp \
   graph.cpp \
   helpers.cpp \
@@ -211 +210 @@
   leastsquaremin.cpp \
   Line.cpp \
-  LineSegment.cpp \
   linkedcell.cpp \
   log.cpp \
@@ -257 +255 @@
   ellipsoid.hpp \
   errorlogger.hpp \
+  Formula.hpp \
   graph.hpp \
   helpers.hpp \
@@ -262 +261 @@
   leastsquaremin.hpp \
   Line.hpp \
-  LineSegment.hpp \
   linkedcell.hpp \
   lists.hpp \