diff --git a/.gitattributes b/.gitattributes index 1ff0c42..51617f5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,7 +10,7 @@ # default for csharp files. # Note: This is only used by command line ############################################################################### -#*.cs diff=csharp +*.cs diff=csharp ############################################################################### # Set the merge driver for project and solution files @@ -22,27 +22,27 @@ # these files as binary and thus will always conflict and require user # intervention with every merge. To do so, just uncomment the entries below ############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary +*.sln merge=binary +*.csproj merge=binary +*.vbproj merge=binary +*.vcxproj merge=binary +*.vcproj merge=binary +*.dbproj merge=binary +*.fsproj merge=binary +*.lsproj merge=binary +*.wixproj merge=binary +*.modelproj merge=binary +*.sqlproj merge=binary +*.wwaproj merge=binary ############################################################################### # behavior for image files # # image files are treated as binary by default. ############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary +*.jpg binary +*.png binary +*.gif binary ############################################################################### # diff behavior for common document formats @@ -51,13 +51,13 @@ # is only available from the command line. Turn it on by uncommenting the # entries below. ############################################################################### -#*.doc diff=astextplain -#*.DOC diff=astextplain -#*.docx diff=astextplain -#*.DOCX diff=astextplain -#*.dot diff=astextplain -#*.DOT diff=astextplain -#*.pdf diff=astextplain -#*.PDF diff=astextplain -#*.rtf diff=astextplain -#*.RTF diff=astextplain +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index 3c4efe2..8332dac 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ +[Bb]uild/ # Visual Studio 2015 cache/options directory .vs/ @@ -171,6 +172,9 @@ csx/ ecf/ rcf/ +# Microsoft Azure ApplicationInsights config file +ApplicationInsights.config + # Windows Store app package directories and files AppPackages/ BundleArtifacts/ @@ -187,6 +191,7 @@ _pkginfo.txt ClientBin/ ~$* *~ +.*.swp *.dbmdl *.dbproj.schemaview *.jfm @@ -256,6 +261,178 @@ paket-files/ # CodeRush .cr/ -# Python Tools for Visual Studio (PTVS) +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app +/windows/LightGBM.VC.db +lightgbm + +# Created by https://www.gitignore.io/api/python + +### Python ### +!/python-package/lightgbm/ + +# Byte-compiled / optimized / DLL files __pycache__/ -*.pyc \ No newline at end of file +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*,cover +.hypothesis/ +**/coverage.html +**/coverage.html.zip +R-package/tests/testthat/Rplots.pdf + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ +docs/pythonapi/ + +# Doxygen documentation +docs/doxyoutput/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# dotenv +.env + +# virtualenv +.venv/ +venv/ +ENV/ + +# Spyder project settings +.spyderproject + +# Rope project settings +.ropeproject + +# R testing artefact +lightgbm.model + +# saved or dumped model/data +*.model +*.pkl +*.bin + +# macOS +**/.DS_Store + +# VSCode +.vscode + +# IntelliJ IDEA +.idea/ + +# Files from local Python install +python-package/LICENSE +python-package/build_cpp/ +python-package/compile/ +python-package/lightgbm/VERSION.txt + +# R build artefacts +R-package/src/CMakeLists.txt +R-package/src/lib_lightgbm.so.dSYM/ +R-package/src/src/ +lightgbm_r/* +lightgbm*.tar.gz +lightgbm.Rcheck/ + +# Files from interactive R sessions +.Rproj.user +**/.Rhistory + +# Files generated by aspell +**/*.bak + +# GraphViz artifacts +*.gv +*.gv.* diff --git a/wCenterWindow/Resource.h b/wCenterWindow/Resource.h index e56104a..7ede54b 100644 --- a/wCenterWindow/Resource.h +++ b/wCenterWindow/Resource.h @@ -1,4 +1,4 @@ -// resource.h +// resource.h #define IDS_APP_TITLE 100 #define IDS_CLASSNAME 101 #define IDS_HELPTEXT 102 diff --git a/wCenterWindow/framework.h b/wCenterWindow/framework.h index 4a9e0e6..d2f2c59 100644 --- a/wCenterWindow/framework.h +++ b/wCenterWindow/framework.h @@ -1,7 +1,5 @@ // header.h: включаемый файл для стандартных системных включаемых файлов // или включаемые файлы для конкретного проекта -// - #pragma once #include "targetver.h" diff --git a/wCenterWindow/targetver.h b/wCenterWindow/targetver.h index d90003d..362f418 100644 --- a/wCenterWindow/targetver.h +++ b/wCenterWindow/targetver.h @@ -1,6 +1,2 @@ #pragma once - -// // При включении SDKDDKVer.h будет задана самая новая из доступных платформ Windows. -// Если вы планируете сборку приложения для предыдущей версии платформы Windows, включите WinSDKVer.h и -// задайте желаемую платформу в макросе _WIN32_WINNT, прежде чем включать SDKDDKVer.h. #include diff --git a/wCenterWindow/wCenterWindow.cpp b/wCenterWindow/wCenterWindow.cpp index aafc94d..917aed4 100644 --- a/wCenterWindow/wCenterWindow.cpp +++ b/wCenterWindow/wCenterWindow.cpp @@ -1,5 +1,4 @@ // wCenterWindow.cpp : Определяет точку входа для приложения. -// #include "framework.h" #include "wCenterWindow.h" diff --git a/wCenterWindow/wCenterWindow.h b/wCenterWindow/wCenterWindow.h index d00d47e..05dd5f5 100644 --- a/wCenterWindow/wCenterWindow.h +++ b/wCenterWindow/wCenterWindow.h @@ -1,3 +1,2 @@ #pragma once - #include "resource.h" diff --git a/wCenterWindow/wCenterWindow.rc b/wCenterWindow/wCenterWindow.rc index 931f160..10c50de 100644 Binary files a/wCenterWindow/wCenterWindow.rc and b/wCenterWindow/wCenterWindow.rc differ