Travis test

.travis.yml

@@ -26,24 +26,25 @@ before_script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export GTEST=/home/travis/build/$user/googletest/googletest; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export LKDIR=/home/travis/build/$user/lk; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export WEXDIR=/home/travis/build/$user/wex; fi
-#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export SSCDIR=/home/travis/build/$user/ssc; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export SSCDIR=/home/travis/build/$user/ssc; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export SOLTRACEDIR=/home/travis/build/$user/soltrace; fi  
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CORETRACEDIR=$SOLTRACEDIR/coretrace; fi  
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export SOLARPILOTDIR=/home/travis/build/$user/solarpilot; fi  
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/google/googletest /home/travis/build/$user/googletest; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/$user/lk $LKDIR; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/$user/wex $WEXDIR; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/$user/soltrace $SOLTRACEDIR; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/$user/solarpilot $SOLARPILOTDIR; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export GTEST=/Users/travis/build/$user/googletest/googletest; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LKDIR=/Users/travis/build/$user/lk; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export WEXDIR=/Users/travis/build/$user/wex; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export SSCDIR=/Users/travis/build/$user/ssc; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git clone https://github.com/google/googletest /home/travis/build/$user/googletest; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git clone https://github.com/$user/lk $LKDIR; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git clone https://github.com/$user/wex $WEXDIR; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git clone https://github.com/$user/soltrace $SOLTRACEDIR; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git clone https://github.com/$user/solarpilot $SOLARPILOTDIR; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/NREL/lk $LKDIR; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/NREL/wex $WEXDIR; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/mjwagner2/ssc -b solarpilot-develop $SSCDIR; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/NREL/soltrace $SOLTRACEDIR; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/NREL/solarpilot $SOLARPILOTDIR; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export GTEST=/Users/travis/build/$user/googletest/googletest; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LKDIR=/Users/travis/build/$user/lk; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export WEXDIR=/Users/travis/build/$user/wex; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export SSCDIR=/Users/travis/build/$user/ssc; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git clone https://github.com/google/googletest /home/travis/build/$user/googletest; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git clone https://github.com/$user/lk $LKDIR; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git clone https://github.com/$user/wex $WEXDIR; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git clone https://github.com/$user/soltrace $SOLTRACEDIR; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git clone https://github.com/$user/solarpilot $SOLARPILOTDIR; fi
 
 script:
  # - ./configure --enable-gcov && make && make_check
@@ -71,14 +72,14 @@ script:
 
 install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libgtk2.0-dev libgl1-mesa-dev mesa-common-dev freeglut3-dev libcurl4-openssl-dev libc6; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi 
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi 
 
 after_sucess:
    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then coveralls --exclude lib --exclude tests --gcov-options '\-lp'; fi
 
 branches:
   only:
-  - master
-  - develop 
-  - travis-test
+#  - master
+#  - develop 
+  - travis

.vscode/c_cpp_properties.json

@@ -18,9 +18,12 @@
                 "${workspaceRoot}/../ssc/solarpilot",
                 "${workspaceRoot}/../wex/include",
                 "${workspaceRoot}/../SolTrace/coretrace"
-
             ],
-            "defines": ["SP_USE_SOLTRACE","SP_STANDALONE","SP_USE_THREADS"],
+            "defines": [
+                "SP_USE_SOLTRACE",
+                "SP_STANDALONE",
+                "SP_USE_THREADS"
+            ],
             "intelliSenseMode": "clang-x64",
             "browse": {
                 "path": [
@@ -38,12 +41,12 @@
                     "${workspaceRoot}/../lk/include",
                     "${workspaceRoot}/../ssc/solarpilot",
                     "${workspaceRoot}/../wex/include",
-                    "${workspaceRoot}/../SolTrace/coretrace"                    
+                    "${workspaceRoot}/../SolTrace/coretrace"
                 ],
                 "limitSymbolsToIncludedHeaders": true,
                 "databaseFilename": ""
             }
         }
     ],
-    "version": 3
+    "version": 4
 }

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "files.exclude": {
+        "**/*.o": true
+    }
+}

build_linux/Makefile-UI

@@ -8,20 +8,21 @@ WEXDIR = $(HOMEDIR)/wex
 WEXLIB = $(WEXDIR)/wexuxwx3.a
 LKDIR = $(HOMEDIR)/lk
 LKLIB = $(LKDIR)/lkuxwx3.a
-STDIR = $(HOMEDIR)/SolTrace/coretrace
+STDIR = $(HOMEDIR)/soltrace/coretrace
 STLIB = $(STDIR)/build_linux/coretrace.a
 SHAREDIR = $(SSCDIR)/build_linux
 SHAREDLIB = $(SHAREDIR)/shared.a
 FCLIB = ./fieldcore.a
 FCDIR = $(SSCDIR)/solarpilot
 NLOPTLIB = $(SHAREDIR)/nlopt.a
+LPSOLVELIB = $(SHAREDIR)/lpsolve.a
 
 CC = g++ 
 CXX = g++
-CFLAGS = -I. -I$(WEXDIR)/include -I$(LKDIR)/include -I$(SSCDIR) -I../rapidxml -I$(FCDIR) -I$(STDIR) -D__64BIT__ -g -O3 -std=c++0x -DLK_USE_WXWIDGETS -DSP_STANDALONE -D_GLIBCXX_USE_NANOSLEEP `wx-config-3 --cflags` 
+CFLAGS = -I. -I$(WEXDIR)/include -I$(LKDIR)/include -I$(SSCDIR) -I../rapidxml -I$(FCDIR) -I$(STDIR) -D__64BIT__ -g -O3 -std=c++0x -no-pie -DLK_USE_WXWIDGETS -DSP_STANDALONE -D_GLIBCXX_USE_NANOSLEEP `wx-config-3 --cflags` 
 
 CXXFLAGS = $(CFLAGS)
-LDFLAGS =  $(WEXLIB) $(LKLIB) $(STLIB) $(FCLIB) $(NLOPTLIB) $(SHAREDLIB)  `wx-config-3 --libs stc` `wx-config-3 --libs aui` `wx-config-3 --libs` -lm  -lfontconfig -ldl -lcurl
+LDFLAGS =  $(WEXLIB) $(LKLIB) $(STLIB) $(FCLIB) $(NLOPTLIB) $(SHAREDLIB) $(LPSOLVELIB) `wx-config-3 --libs stc` `wx-config-3 --libs aui` `wx-config-3 --libs` -lm  -lfontconfig -ldl -lcurl -no-pie
 
 
 OBJECTS  = \
@@ -49,6 +50,7 @@ OBJECTS  = \
 	OutputControl.o \
 	kml_select_dialog.o \
 	layout_sim_export_dialog.o \
+	plot_select_dialog.o \
 	numericvareditform.o \
 	pagepanel.o \
 	param_dialog.o \

build_linux/Makefile-solarpilot

@@ -3,14 +3,15 @@ SSCDIR = ../../ssc
 VPATH = $(SSCDIR)/solarpilot
 
 STDIR = ../../soltrace/coretrace
-STLIB = $(STDIR)/build_linux/coretrace.a
-SHARELIB = $(SSCDIR)/build_linux/shared.a
+#STLIB = $(STDIR)/build_linux/coretrace.a
+#SHARELIB = $(SSCDIR)/build_linux/shared.a
 NLOPTDIR = $(SSCDIR)/nlopt
-NLOPTLIB = $(SSCDIR)/build_linux/nlopt.a
+#NLOPTLIB = $(SSCDIR)/build_linux/nlopt.a
+LPSOLVEDIR = $(SSCDIR)/lpsolve
 
 CC = g++ #gcc
 CXX = g++
-CFLAGS = -fPIC -Wall -g -O3 -DSP_STANDALONE -I../ -D__64BIT__ -I$(NLOPTDIR) -I$(STDIR) -I../rapidxml -I$(SSCDIR) -std=c++0x -D_GLIBCXX_USE_NANOSLEEP
+CFLAGS = -fPIC -Wall -g -O3 -DSP_STANDALONE -I../ -D__64BIT__ -I$(NLOPTDIR) -I$(STDIR) -I$(LPSOLVEDIR) -I../rapidxml -I$(SSCDIR) -std=c++0x -D_GLIBCXX_USE_NANOSLEEP
 CXXFLAGS = $(CFLAGS) #$(STLIB) $(SHARELIB) $(NLOPTLIB)
 
 OBJECTS = \
@@ -29,6 +30,7 @@ Land.o \
 LayoutSimulateThread.o \
 mod_base.o \
 OpticalMesh.o \
+MultiRecOptimize.o\
 optimize.o \
 Receiver.o \
 Ambient.o \

build_vs2017/SolarPILOT-UI.vcxproj

@@ -175,7 +175,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SSCDIR)\lpsolve;$(LKDIR)\include;$(SSCDIR);$(SSCDIR)\nlopt;$(SSCDIR)\solarpilot;$(SolutionDir)\..\app;$(CORETRACEDIR);$(WXMSW3)\lib\vc_lib\mswud;$(WXMSW3)\include;$(WEXDIR)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SP_STANDALONE;LK_USE_WXWIDGETS;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_WINDOWS;NOPCH;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;SP_STANDALONE;LK_USE_WXWIDGETS;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_WINDOWS;NOPCH;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -217,7 +217,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(LKDIR)\include;$(SSCDIR);$(SSCDIR)\lpsolve;$(SSCDIR)\nlopt;$(SSCDIR)\solarpilot;$(SolutionDir)\..\app;$(CORETRACEDIR);$(WXMSW3)\lib\vc_x64_lib\mswud;$(WXMSW3)\include;$(WEXDIR)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SP_STANDALONE;LK_USE_WXWIDGETS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_WINDOWS;NOPCH;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;SP_STANDALONE;LK_USE_WXWIDGETS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_WINDOWS;NOPCH;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -258,7 +258,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>$(SSCDIR)\lpsolve;$(LKDIR)\include;$(SSCDIR);$(SSCDIR)\nlopt;$(SSCDIR)\solarpilot;$(SolutionDir)\..\app;$(CORETRACEDIR);$(WXMSW3)\lib\vc_lib\mswu;$(WXMSW3)\include;$(WEXDIR)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SP_STANDALONE;_WINDLL;LK_USE_WXWIDGETS;WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;SP_STANDALONE;_WINDLL;LK_USE_WXWIDGETS;WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -301,7 +301,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>$(SSCDIR)\lpsolve;$(LKDIR)\include;$(SSCDIR);$(SSCDIR)\nlopt;$(SSCDIR)\solarpilot;$(SolutionDir)\..\app;$(CORETRACEDIR);$(WXMSW3)\lib\vc_x64_lib\mswu;$(WXMSW3)\include;$(WEXDIR)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SP_STANDALONE;_WINDLL;LK_USE_WXWIDGETS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;SP_STANDALONE;_WINDLL;LK_USE_WXWIDGETS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>

build_vs2017/solarpilot.vcxproj

@@ -145,7 +145,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SSCDIR)\lpsolve;$(SolutionDir)\..\rapidxml;$(SolutionDir)\..\custom;$(SolutionDir)\..\solpos;$(SSCDIR);$(SSCDIR)\nlopt;$(SSCDIR)\solarpilot;$(WEXDIR);$(CORETRACEDIR)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SP_STANDALONE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_MBCS;</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;SP_STANDALONE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_MBCS;</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -156,7 +156,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SSCDIR)\lpsolve;$(SolutionDir)\..\rapidxml;$(SolutionDir)\..\custom;$(SolutionDir)\..\solpos;$(SSCDIR);$(SSCDIR)\nlopt;$(SSCDIR)\solarpilot;$(WEXDIR);$(CORETRACEDIR)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SP_STANDALONE;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_MBCS;</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;SP_STANDALONE;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_MBCS;</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -169,7 +169,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SSCDIR)\lpsolve;$(SolutionDir)\..\rapidxml;$(SolutionDir)\..\custom;$(SolutionDir)\..\solpos;$(SSCDIR);$(SSCDIR)\nlopt;$(SSCDIR)\solarpilot;$(WEXDIR);$(CORETRACEDIR)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SP_STANDALONE;_MBCS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;SP_STANDALONE;_MBCS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -184,7 +184,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SSCDIR)\lpsolve;$(SolutionDir)\..\rapidxml;$(SolutionDir)\..\custom;$(SolutionDir)\..\solpos;$(SSCDIR);$(SSCDIR)\nlopt;$(SSCDIR)\solarpilot;$(WEXDIR);$(CORETRACEDIR)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SP_STANDALONE;_MBCS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;SP_STANDALONE;_MBCS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>