• R/O
  • SSH
  • HTTPS

ebsd-conograph: Commit


Commit MetaInfo

Revision8 (tree)
Time2020-03-31 16:55:06
Authorrtomiyasu

Log Message

Compile Warnings have been removed.

Change Summary

Incremental Difference

--- EBSDConograph/src/marquardt_codes/levenberg_marquardt/stopx.cc (revision 7)
+++ EBSDConograph/src/marquardt_codes/levenberg_marquardt/stopx.cc (revision 8)
@@ -48,38 +48,3 @@
4848 {
4949 return interrupted;
5050 }
51-
52-// for GUI
53-#include <sstream>
54-#include <iomanip>
55-#include <cmath>
56-using namespace std;
57-namespace
58-{
59- const char *functionName = "";
60- int progIndiv = 0;
61- int progTotal = 0;
62-}
63-void interruptCansel() { interrupted = 2; }
64-void interruptSkip () { interrupted = 1; }
65-void interruptClear () { interrupted = 0; }
66-string getProgress()
67-{
68- ostringstream oss;
69- oss <<setw(3)<< ::progTotal <<setw(4)<< ::progIndiv <<"%: "<< ::functionName;
70- return oss.str();
71-}
72-void setProgress(const int indiv, const int total, const int span, const char *funcName)
73-{
74- ::progIndiv = indiv==0 ? 0 : max(::progIndiv, indiv);
75- ::progTotal = total + ::progIndiv * span/100;
76- ::functionName = funcName;
77-}
78-bool IS_CANSELED()
79-{
80- return interrupted == 2;
81-}
82-void CHECK_INTERRUPTION() throw(const char*)
83-{
84- if(IS_CANSELED()) { throw("abort"); }
85-}
--- EBSDConograph/src/marquardt_codes/levenberg_marquardt/stopx.hh (revision 7)
+++ EBSDConograph/src/marquardt_codes/levenberg_marquardt/stopx.hh (revision 8)
@@ -35,15 +35,4 @@
3535
3636 int putInterruptionSignal();
3737
38-// for GUI
39-#include <string>
40-void interruptSkip ();
41-void interruptCansel();
42-void interruptClear ();
43-std::string getProgress();
44-void setProgress(const int individual, const int total, const int span, const char *funcName);
45-#define SET_PROGRESS(individual, total, span) setProgress(individual, total, span, __FUNCTION__)
46-void CHECK_INTERRUPTION() throw(const char*); // throws an exception if interrupted, so must be called outside OMP blocks
47-bool IS_CANSELED();
48-
4938 #endif /*STOPX_HH_*/
--- EBSDConograph/CMakeLists.txt (nonexistent)
+++ EBSDConograph/CMakeLists.txt (revision 8)
@@ -0,0 +1,10 @@
1+cmake_minimum_required(VERSION 2.8)
2+cmake_policy(SET CMP0015 NEW)
3+
4+file(GLOB_RECURSE files src/*.cc)
5+
6+set(CMAKE_BUILD_TYPE Release)
7+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
8+
9+
10+add_executable (EBSDConograph ${files})
Show on old repository browser