Merge pull request #323 from rogerfraser/master

Initial changes to address issue 305

Author: daleroberts

dynadjust/dynadjust/dnaimport/dnainterop.cpp

@@ -4926,20 +4926,33 @@ void dna_import::PrintMeasurementsToStations(std::string& m2s_file, MsrTally* pa
 	switch (projectSettings_.o._sort_msr_to_stn)
 	{
 	case meas_stn_sort_ui:
-	{
-		// sort summary according to measurement to station count
+	{	// sort summary according to measurement to station count (ascending)
+        // Note: this is the default sort order
 		CompareMeasCount2<ASLPtr, UINT32> msrcountCompareFunc(vAssocStnList);
 		std::sort(vStationList.begin(), vStationList.end(), msrcountCompareFunc);
+		break;
+	}
+    case saem_stn_sort_ui: {  
+		// sort summary according to measurement to station count (descending)
+        CompareMeasCount2Desc<ASLPtr, UINT32> msrcountCompareFunc(vAssocStnList);
+        std::sort(vStationList.begin(), vStationList.end(), msrcountCompareFunc);
+        break;
+    }
+    case name_stn_sort_ui:	
+	{
+		// sort summary according to station name
+        CompareStnNameOrder<station_t, UINT32> stnnameCompareFunc(&bstBinaryRecords);
+		std::sort(vStationList.begin(), vStationList.end(), stnnameCompareFunc);
+		break;
 	}
-	break;
 	case orig_stn_sort_ui:
 	default:
 	{
 		// sort summary according to original station file order
 		CompareStnFileOrder<station_t, UINT32> stnorderCompareFunc(&bstBinaryRecords);
 		std::sort(vStationList.begin(), vStationList.end(), stnorderCompareFunc);
+		break;
 	}
-	break;
 	}
 
 	std::ofstream m2s_stream;

dynadjust/dynadjust/dnaimportwrapper/dnaimportwrapper.cpp

@@ -1354,9 +1354,11 @@ int main(int argc, char* argv[]) {
 
         output_options.add_options()(OUTPUT_MSR_TO_STN, "Output summary of measurements connected to each station.")(
             OUTPUT_MSR_TO_STN_SORTBY, boost::program_options::value<UINT16>(&p.o._sort_msr_to_stn),
-            std::string("Sort order for measurement to stations summary.\n  " + StringFromT(orig_stn_sort_ui) +
-                        ": Original station order (default)\n  " + StringFromT(meas_stn_sort_ui) +
-                        ": Measurement count")
+            std::string("Sort order for measurement to stations summary.\n  " + 
+                StringFromT(orig_stn_sort_ui) + ": Original station order (default)\n  " + 
+                StringFromT(name_stn_sort_ui) + ": Station name\n  " + 
+                StringFromT(meas_stn_sort_ui) + ": Measurement count (ascending)\n  " +
+                StringFromT(saem_stn_sort_ui) + ": Measurement count (descending)")
                 .c_str());
 
         export_options.add_options()(EXPORT_XML_FILES,

dynadjust/include/config/dnatypes-gui.hpp

@@ -59,7 +59,9 @@ typedef enum ADJ_MSR_SORT_UI
 typedef enum MSR_TO_STN_SORT_UI
 {
 	orig_stn_sort_ui = 0,		// original station order
-	meas_stn_sort_ui = 1		// measurement count
+    name_stn_sort_ui = 1,		// station name
+	meas_stn_sort_ui = 2,		// measurement count (ascending)
+    saem_stn_sort_ui = 3		// measurement count (descending)
 } _MSR_TO_STN_SORT_UI_;
 
 

dynadjust/include/functions/dnatemplatefuncs.hpp

@@ -507,7 +507,23 @@ class CompareMeasCount2
 };
 
 
-template<typename A, typename U>
+template <typename A, typename U>
+class CompareMeasCount2Desc {
+   public:
+    CompareMeasCount2Desc(const std::vector<A>* a): _a(a) {}
+
+    bool operator()(const U& lhs, const U& rhs) {
+        if (_a->at(lhs).get()->GetAssocMsrCount() == _a->at(rhs).get()->GetAssocMsrCount())
+            return _a->at(lhs).get()->GetAMLStnIndex() > _a->at(rhs).get()->GetAMLStnIndex();
+        return _a->at(lhs).get()->GetAssocMsrCount() > _a->at(rhs).get()->GetAssocMsrCount();
+    }
+
+   private:
+    const std::vector<A>* _a;
+};
+
+
+template <typename A, typename U>
 class CompareValidity
 {
 public:
@@ -624,6 +640,21 @@ class CompareStnFileOrder
 };
 
 
+// S = station_t, U = UINT32
+template <typename S, typename U>
+class CompareStnNameOrder
+{
+public:
+    CompareStnNameOrder(std::vector<S>* s)
+		: _s(s) {}
+    bool operator()(const U& lhs, const U& rhs) {
+		//return std::string(_s->at(lhs).stationName) < std::string(_s->at(rhs).stationName);
+		return _s->at(lhs).nameOrder < _s->at(rhs).nameOrder; 
+	}
+private:
+    std::vector<S>* _s;
+};
+
 // S = CDnaStation
 template<typename S, typename T>
 class CompareStnName_CDnaStn

dynadjust/include/io/dnaiosnxread.cpp

@@ -899,7 +899,7 @@ void DnaIoSnx::ParseSinexStn(std::ifstream** snx_file, const char* sinexRec, vdn
 	dnaStnPtr stn_ptr;	
 	UINT32 yy, doy, file_rec(0);
 
-	fileOrder = 0;
+	//fileOrder = 0;
 	uniqueStationCount_ = 0;
 
 	while (sBuf.at(0) != '-')