Changing license to New BSD (3-Clause version)

[anna.git] / source / statistics / Accumulator.cpp

diff --git a/source/statistics/Accumulator.cpp b/source/statistics/Accumulator.cpp
index 9600b6e..c8c5abf 100644 (file)
--- a/source/statistics/Accumulator.cpp
+++ b/source/statistics/Accumulator.cpp
@@ -1,8 +1,8 @@
-// ANNA - Anna is Not 'N' Anymore
+// ANNA - Anna is Not Nothingness Anymore
 //
 // (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
 //
-// https://bitbucket.org/testillano/anna
+// http://redmine.teslayout.com/projects/anna-suite
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
@@ -14,7 +14,7 @@
 // copyright notice, this list of conditions and the following disclaimer
 // in the documentation and/or other materials provided with the
 // distribution.
-//     * Neither the name of Google Inc. nor the names of its
+//     *  Neither the name of the copyright holder nor the names of its
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
@@ -341,7 +341,7 @@ std::string Accumulator::asString(const int & numberOfDecimals) const throw() {
     trace += conceptDescription; trace += " ("; trace += conceptUnitDescription; trace += ")";
 
     if(ptrConceptData->Size != 0) {
-      trace += "\n   Sample Size:                 "; trace += anna::functions::asString((anna::Unsigned64)(ptrConceptData->Size));
+      trace += "\n   Sample Size:                 "; trace += anna::functions::asString((anna::U64)(ptrConceptData->Size));
       trace += "\n   Average:                     "; trace += anna::functions::asString(fFormat.c_str(), ptrConceptData->Average);
       trace += "\n   Standard Deviation:          "; trace += anna::functions::asString(fFormat.c_str(), getStandardDeviation(ptrConceptData));
 
@@ -433,7 +433,7 @@ anna::xml::Node* Accumulator::asXML(anna::xml::Node* parent, const int & numberO
     anna::xml::Node* data = concept->createChild("Data");
 
     if(ptrConceptData->Size != 0) {
-      data->createAttribute("Size", anna::functions::asString((anna::Unsigned64)ptrConceptData->Size));
+      data->createAttribute("Size", anna::functions::asString((anna::U64)ptrConceptData->Size));
       data->createAttribute("Average", anna::functions::asString(fFormat.c_str(), ptrConceptData->Average));
       data->createAttribute("StandardDeviation", anna::functions::asString(fFormat.c_str(), getStandardDeviation(ptrConceptData)));