mirror of
https://github.com/vcmi/vcmi.git
synced 2024-11-28 08:48:48 +02:00
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
This commit is contained in:
DjWarmonger
commit
021eb4b5b5
@ -72,84 +72,189 @@
|
||||
<Add option="-Wno-sign-compare" />
|
||||
<Add option="-Wno-unused-parameter" />
|
||||
<Add option="-Wno-overloaded-virtual" />
|
||||
<Add option="-DFL_CPP11" />
|
||||
<Add directory="$(#boost.include)" />
|
||||
<Add directory="fuzzylite" />
|
||||
</Compiler>
|
||||
<Unit filename="AreaCentroidAlgorithm.cpp" />
|
||||
<Unit filename="AreaCentroidAlgorithm.h" />
|
||||
<Unit filename="CompoundTerm.cpp" />
|
||||
<Unit filename="CompoundTerm.h" />
|
||||
<Unit filename="DescriptiveAntecedent.cpp" />
|
||||
<Unit filename="DescriptiveAntecedent.h" />
|
||||
<Unit filename="DiscreteTerm.cpp" />
|
||||
<Unit filename="DiscreteTerm.h" />
|
||||
<Unit filename="FunctionTerm.cpp" />
|
||||
<Unit filename="FunctionTerm.h" />
|
||||
<Unit filename="FuzzyAnd.cpp" />
|
||||
<Unit filename="FuzzyAnd.h" />
|
||||
<Unit filename="FuzzyAntecedent.cpp" />
|
||||
<Unit filename="FuzzyAntecedent.h" />
|
||||
<Unit filename="FuzzyConsequent.cpp" />
|
||||
<Unit filename="FuzzyConsequent.h" />
|
||||
<Unit filename="FuzzyDefuzzifier.cpp" />
|
||||
<Unit filename="FuzzyDefuzzifier.h" />
|
||||
<Unit filename="FuzzyEngine.cpp" />
|
||||
<Unit filename="FuzzyEngine.h" />
|
||||
<Unit filename="FuzzyException.cpp" />
|
||||
<Unit filename="FuzzyException.h" />
|
||||
<Unit filename="FuzzyExceptions.cpp" />
|
||||
<Unit filename="FuzzyExceptions.h" />
|
||||
<Unit filename="FuzzyLite.h" />
|
||||
<Unit filename="FuzzyModulation.cpp" />
|
||||
<Unit filename="FuzzyModulation.h" />
|
||||
<Unit filename="FuzzyOperation.cpp" />
|
||||
<Unit filename="FuzzyOperation.h" />
|
||||
<Unit filename="FuzzyOperator.cpp" />
|
||||
<Unit filename="FuzzyOperator.h" />
|
||||
<Unit filename="FuzzyOr.cpp" />
|
||||
<Unit filename="FuzzyOr.h" />
|
||||
<Unit filename="FuzzyRule.cpp" />
|
||||
<Unit filename="FuzzyRule.h" />
|
||||
<Unit filename="Hedge.cpp" />
|
||||
<Unit filename="Hedge.h" />
|
||||
<Unit filename="HedgeSet.cpp" />
|
||||
<Unit filename="HedgeSet.h" />
|
||||
<Unit filename="InfixToPostfix.cpp" />
|
||||
<Unit filename="InfixToPostfix.h" />
|
||||
<Unit filename="InputLVar.cpp" />
|
||||
<Unit filename="InputLVar.h" />
|
||||
<Unit filename="LinguisticTerm.cpp" />
|
||||
<Unit filename="LinguisticTerm.h" />
|
||||
<Unit filename="LinguisticVariable.cpp" />
|
||||
<Unit filename="LinguisticVariable.h" />
|
||||
<Unit filename="MamdaniConsequent.cpp" />
|
||||
<Unit filename="MamdaniConsequent.h" />
|
||||
<Unit filename="MamdaniRule.cpp" />
|
||||
<Unit filename="MamdaniRule.h" />
|
||||
<Unit filename="OutputLVar.cpp" />
|
||||
<Unit filename="OutputLVar.h" />
|
||||
<Unit filename="RectangularTerm.cpp" />
|
||||
<Unit filename="RectangularTerm.h" />
|
||||
<Unit filename="RuleBlock.cpp" />
|
||||
<Unit filename="RuleBlock.h" />
|
||||
<Unit filename="ShoulderTerm.cpp" />
|
||||
<Unit filename="ShoulderTerm.h" />
|
||||
<Unit filename="SingletonTerm.cpp" />
|
||||
<Unit filename="SingletonTerm.h" />
|
||||
<Unit filename="StrOp.cpp" />
|
||||
<Unit filename="StrOp.h" />
|
||||
<Unit filename="TakagiSugenoConsequent.cpp" />
|
||||
<Unit filename="TakagiSugenoConsequent.h" />
|
||||
<Unit filename="TakagiSugenoRule.cpp" />
|
||||
<Unit filename="TakagiSugenoRule.h" />
|
||||
<Unit filename="TakagiSugenoTerm.cpp" />
|
||||
<Unit filename="TakagiSugenoTerm.h" />
|
||||
<Unit filename="TrapezoidalTerm.cpp" />
|
||||
<Unit filename="TrapezoidalTerm.h" />
|
||||
<Unit filename="TriangularTerm.cpp" />
|
||||
<Unit filename="TriangularTerm.h" />
|
||||
<Unit filename="defs.h" />
|
||||
<Unit filename="flScalar.h" />
|
||||
<Unit filename="main.cpp" />
|
||||
<Unit filename="test.h" />
|
||||
<Unit filename="fuzzylite/fl/Console.h" />
|
||||
<Unit filename="fuzzylite/fl/Engine.h" />
|
||||
<Unit filename="fuzzylite/fl/Exception.h" />
|
||||
<Unit filename="fuzzylite/fl/Headers.h" />
|
||||
<Unit filename="fuzzylite/fl/Operation.h" />
|
||||
<Unit filename="fuzzylite/fl/defuzzifier/Bisector.h" />
|
||||
<Unit filename="fuzzylite/fl/defuzzifier/Centroid.h" />
|
||||
<Unit filename="fuzzylite/fl/defuzzifier/Defuzzifier.h" />
|
||||
<Unit filename="fuzzylite/fl/defuzzifier/IntegralDefuzzifier.h" />
|
||||
<Unit filename="fuzzylite/fl/defuzzifier/LargestOfMaximum.h" />
|
||||
<Unit filename="fuzzylite/fl/defuzzifier/MeanOfMaximum.h" />
|
||||
<Unit filename="fuzzylite/fl/defuzzifier/SmallestOfMaximum.h" />
|
||||
<Unit filename="fuzzylite/fl/defuzzifier/WeightedAverage.h" />
|
||||
<Unit filename="fuzzylite/fl/defuzzifier/WeightedDefuzzifier.h" />
|
||||
<Unit filename="fuzzylite/fl/defuzzifier/WeightedSum.h" />
|
||||
<Unit filename="fuzzylite/fl/factory/CloningFactory.h" />
|
||||
<Unit filename="fuzzylite/fl/factory/ConstructionFactory.h" />
|
||||
<Unit filename="fuzzylite/fl/factory/DefuzzifierFactory.h" />
|
||||
<Unit filename="fuzzylite/fl/factory/FactoryManager.h" />
|
||||
<Unit filename="fuzzylite/fl/factory/FunctionFactory.h" />
|
||||
<Unit filename="fuzzylite/fl/factory/HedgeFactory.h" />
|
||||
<Unit filename="fuzzylite/fl/factory/SNormFactory.h" />
|
||||
<Unit filename="fuzzylite/fl/factory/TNormFactory.h" />
|
||||
<Unit filename="fuzzylite/fl/factory/TermFactory.h" />
|
||||
<Unit filename="fuzzylite/fl/fuzzylite.h" />
|
||||
<Unit filename="fuzzylite/fl/hedge/Any.h" />
|
||||
<Unit filename="fuzzylite/fl/hedge/Extremely.h" />
|
||||
<Unit filename="fuzzylite/fl/hedge/Hedge.h" />
|
||||
<Unit filename="fuzzylite/fl/hedge/Not.h" />
|
||||
<Unit filename="fuzzylite/fl/hedge/Seldom.h" />
|
||||
<Unit filename="fuzzylite/fl/hedge/Somewhat.h" />
|
||||
<Unit filename="fuzzylite/fl/hedge/Very.h" />
|
||||
<Unit filename="fuzzylite/fl/imex/CppExporter.h" />
|
||||
<Unit filename="fuzzylite/fl/imex/Exporter.h" />
|
||||
<Unit filename="fuzzylite/fl/imex/FclExporter.h" />
|
||||
<Unit filename="fuzzylite/fl/imex/FclImporter.h" />
|
||||
<Unit filename="fuzzylite/fl/imex/FisExporter.h" />
|
||||
<Unit filename="fuzzylite/fl/imex/FisImporter.h" />
|
||||
<Unit filename="fuzzylite/fl/imex/FldExporter.h" />
|
||||
<Unit filename="fuzzylite/fl/imex/FllExporter.h" />
|
||||
<Unit filename="fuzzylite/fl/imex/FllImporter.h" />
|
||||
<Unit filename="fuzzylite/fl/imex/Importer.h" />
|
||||
<Unit filename="fuzzylite/fl/imex/JavaExporter.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/Norm.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/SNorm.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/TNorm.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/s/AlgebraicSum.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/s/BoundedSum.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/s/DrasticSum.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/s/EinsteinSum.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/s/HamacherSum.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/s/Maximum.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/s/NilpotentMaximum.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/s/NormalizedSum.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/t/AlgebraicProduct.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/t/BoundedDifference.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/t/DrasticProduct.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/t/EinsteinProduct.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/t/HamacherProduct.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/t/Minimum.h" />
|
||||
<Unit filename="fuzzylite/fl/norm/t/NilpotentMinimum.h" />
|
||||
<Unit filename="fuzzylite/fl/rule/Antecedent.h" />
|
||||
<Unit filename="fuzzylite/fl/rule/Consequent.h" />
|
||||
<Unit filename="fuzzylite/fl/rule/Expression.h" />
|
||||
<Unit filename="fuzzylite/fl/rule/Rule.h" />
|
||||
<Unit filename="fuzzylite/fl/rule/RuleBlock.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Accumulated.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Activated.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Bell.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Concave.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Constant.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Cosine.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Discrete.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Function.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Gaussian.h" />
|
||||
<Unit filename="fuzzylite/fl/term/GaussianProduct.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Linear.h" />
|
||||
<Unit filename="fuzzylite/fl/term/PiShape.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Ramp.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Rectangle.h" />
|
||||
<Unit filename="fuzzylite/fl/term/SShape.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Sigmoid.h" />
|
||||
<Unit filename="fuzzylite/fl/term/SigmoidDifference.h" />
|
||||
<Unit filename="fuzzylite/fl/term/SigmoidProduct.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Spike.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Term.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Trapezoid.h" />
|
||||
<Unit filename="fuzzylite/fl/term/Triangle.h" />
|
||||
<Unit filename="fuzzylite/fl/term/ZShape.h" />
|
||||
<Unit filename="fuzzylite/fl/variable/InputVariable.h" />
|
||||
<Unit filename="fuzzylite/fl/variable/OutputVariable.h" />
|
||||
<Unit filename="fuzzylite/fl/variable/Variable.h" />
|
||||
<Unit filename="fuzzylite/src/Console.cpp" />
|
||||
<Unit filename="fuzzylite/src/Engine.cpp" />
|
||||
<Unit filename="fuzzylite/src/Exception.cpp" />
|
||||
<Unit filename="fuzzylite/src/Operation.cpp" />
|
||||
<Unit filename="fuzzylite/src/defuzzifier/Bisector.cpp" />
|
||||
<Unit filename="fuzzylite/src/defuzzifier/Centroid.cpp" />
|
||||
<Unit filename="fuzzylite/src/defuzzifier/IntegralDefuzzifier.cpp" />
|
||||
<Unit filename="fuzzylite/src/defuzzifier/LargestOfMaximum.cpp" />
|
||||
<Unit filename="fuzzylite/src/defuzzifier/MeanOfMaximum.cpp" />
|
||||
<Unit filename="fuzzylite/src/defuzzifier/SmallestOfMaximum.cpp" />
|
||||
<Unit filename="fuzzylite/src/defuzzifier/WeightedAverage.cpp" />
|
||||
<Unit filename="fuzzylite/src/defuzzifier/WeightedDefuzzifier.cpp" />
|
||||
<Unit filename="fuzzylite/src/defuzzifier/WeightedSum.cpp" />
|
||||
<Unit filename="fuzzylite/src/factory/CloningFactory.cpp" />
|
||||
<Unit filename="fuzzylite/src/factory/ConstructionFactory.cpp" />
|
||||
<Unit filename="fuzzylite/src/factory/DefuzzifierFactory.cpp" />
|
||||
<Unit filename="fuzzylite/src/factory/FactoryManager.cpp" />
|
||||
<Unit filename="fuzzylite/src/factory/FunctionFactory.cpp" />
|
||||
<Unit filename="fuzzylite/src/factory/HedgeFactory.cpp" />
|
||||
<Unit filename="fuzzylite/src/factory/SNormFactory.cpp" />
|
||||
<Unit filename="fuzzylite/src/factory/TNormFactory.cpp" />
|
||||
<Unit filename="fuzzylite/src/factory/TermFactory.cpp" />
|
||||
<Unit filename="fuzzylite/src/fuzzylite.cpp" />
|
||||
<Unit filename="fuzzylite/src/hedge/Any.cpp" />
|
||||
<Unit filename="fuzzylite/src/hedge/Extremely.cpp" />
|
||||
<Unit filename="fuzzylite/src/hedge/Not.cpp" />
|
||||
<Unit filename="fuzzylite/src/hedge/Seldom.cpp" />
|
||||
<Unit filename="fuzzylite/src/hedge/Somewhat.cpp" />
|
||||
<Unit filename="fuzzylite/src/hedge/Very.cpp" />
|
||||
<Unit filename="fuzzylite/src/imex/CppExporter.cpp" />
|
||||
<Unit filename="fuzzylite/src/imex/Exporter.cpp" />
|
||||
<Unit filename="fuzzylite/src/imex/FclExporter.cpp" />
|
||||
<Unit filename="fuzzylite/src/imex/FclImporter.cpp" />
|
||||
<Unit filename="fuzzylite/src/imex/FisExporter.cpp" />
|
||||
<Unit filename="fuzzylite/src/imex/FisImporter.cpp" />
|
||||
<Unit filename="fuzzylite/src/imex/FldExporter.cpp" />
|
||||
<Unit filename="fuzzylite/src/imex/FllExporter.cpp" />
|
||||
<Unit filename="fuzzylite/src/imex/FllImporter.cpp" />
|
||||
<Unit filename="fuzzylite/src/imex/Importer.cpp" />
|
||||
<Unit filename="fuzzylite/src/imex/JavaExporter.cpp" />
|
||||
<Unit filename="fuzzylite/src/main.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/s/AlgebraicSum.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/s/BoundedSum.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/s/DrasticSum.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/s/EinsteinSum.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/s/HamacherSum.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/s/Maximum.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/s/NilpotentMaximum.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/s/NormalizedSum.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/t/AlgebraicProduct.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/t/BoundedDifference.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/t/DrasticProduct.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/t/EinsteinProduct.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/t/HamacherProduct.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/t/Minimum.cpp" />
|
||||
<Unit filename="fuzzylite/src/norm/t/NilpotentMinimum.cpp" />
|
||||
<Unit filename="fuzzylite/src/rule/Antecedent.cpp" />
|
||||
<Unit filename="fuzzylite/src/rule/Consequent.cpp" />
|
||||
<Unit filename="fuzzylite/src/rule/Expression.cpp" />
|
||||
<Unit filename="fuzzylite/src/rule/Rule.cpp" />
|
||||
<Unit filename="fuzzylite/src/rule/RuleBlock.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Accumulated.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Activated.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Bell.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Concave.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Constant.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Cosine.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Discrete.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Function.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Gaussian.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/GaussianProduct.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Linear.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/PiShape.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Ramp.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Rectangle.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/SShape.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Sigmoid.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/SigmoidDifference.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/SigmoidProduct.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Spike.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Term.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Trapezoid.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/Triangle.cpp" />
|
||||
<Unit filename="fuzzylite/src/term/ZShape.cpp" />
|
||||
<Unit filename="fuzzylite/src/variable/InputVariable.cpp" />
|
||||
<Unit filename="fuzzylite/src/variable/OutputVariable.cpp" />
|
||||
<Unit filename="fuzzylite/src/variable/Variable.cpp" />
|
||||
<Extensions>
|
||||
<code_completion />
|
||||
<envvars />
|
||||
@ -157,4 +262,4 @@
|
||||
<lib_finder disable_auto="1" />
|
||||
</Extensions>
|
||||
</Project>
|
||||
</CodeBlocks_project_file>
|
||||
</CodeBlocks_project_file>
|
||||
|
||||
@ -75,8 +75,10 @@
|
||||
<Add option="-Wno-overloaded-virtual" />
|
||||
<Add option="-DBOOST_THREAD_USE_LIB" />
|
||||
<Add option="-D_WIN32_WINNT=0x0501" />
|
||||
<Add option="-DFL_CPP11" />
|
||||
<Add directory="$(#boost.include)" />
|
||||
<Add directory="../../include" />
|
||||
<Add directory="../FuzzyLite/fuzzylite" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add option="-lFuzzyLite" />
|
||||
|
||||
Loading…
Reference in New Issue
Block a user