test StreamAbstract with MultiHazardProvider

Author: sebastianrowan

compute/simulation_test.go

@@ -101,6 +101,30 @@ func Test_StreamAbstract_MultiFrequency(t *testing.T) {
 	//compute consequences.
 	StreamAbstractMultiFrequency(hazardProviders, frequencies, nsp, w)
 }
+
+func Test_StreamAbstract_MultiHazard(t *testing.T) {
+	//initialize the NSI API structure provider
+	nsp := structureprovider.InitNSISPwithOcctypeFilePath("/workspaces/go-consequences/data/lifecycle/occtypes_reconstruction.json")
+	now := time.Now()
+	fmt.Println(now)
+
+	root := "/workspaces/go-consequences/data/lifecycle/"
+	filepath := root + "test_arrival-depth-duration_hazards.json"
+	w, _ := resultswriters.InitSpatialResultsWriter(root+"multihazardtest_consequences.json", "results", "GeoJSON")
+	//w := consequences.InitSummaryResultsWriterFromFile(root + "_consequences_SUMMARY.json")
+	//create a result writer based on the name of the depth grid.
+	//w, _ := resultswriters.InitGpkResultsWriter(root+"_consequences_nsi.gpkg", "nsi_result")
+	defer w.Close()
+	//initialize a hazard provider based on the depth grid.
+	dfr, err := hazardproviders.InitADDMHP(filepath)
+	if err != nil {
+		panic(err)
+	}
+	//compute consequences.
+	StreamAbstract(dfr, nsp, w)
+	fmt.Println(time.Since(now))
+}
+
 func Test_Config(t *testing.T) {
 	config := Config{
 		StructureProviderInfo: structureprovider.StructureProviderInfo{

hazardproviders/json_multi_hazard.go

@@ -74,7 +74,7 @@ func (j jsonArrivalDepthDurationMultiHazardProvider) Close() {
 	}
 }
 
-func (j jsonArrivalDepthDurationMultiHazardProvider) Hazard(l geography.Location) (hazards.ArrivalDepthandDurationEventMulti, error) {
+func (j jsonArrivalDepthDurationMultiHazardProvider) Hazard(l geography.Location) (hazards.HazardEvent, error) {
 	var hm hazards.ArrivalDepthandDurationEventMulti
 	for i, cr := range j.depthCRs {
 		d, err := cr.ProvideValue(l)
@@ -95,7 +95,7 @@ func (j jsonArrivalDepthDurationMultiHazardProvider) Hazard(l geography.Location
 		h, err = j.process(hd, h)
 		hm.Append(h.(hazards.ArrivalDepthandDurationEvent))
 	}
-	return hm, nil
+	return &hm, nil
 }
 
 func (j jsonArrivalDepthDurationMultiHazardProvider) HazardBoundary() (geography.BBox, error) {

hazardproviders/json_multi_hazard_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/USACE/go-consequences/geography"
+	"github.com/USACE/go-consequences/hazards"
 )
 
 func TestInitADDMHP(t *testing.T) {
@@ -21,7 +22,8 @@ func TestInitADDMHP(t *testing.T) {
 		SRID: "",
 	}
 
-	h, err := ADDMHP.Hazard(loc)
+	haz, err := ADDMHP.Hazard(loc)
+	h := haz.(hazards.ArrivalDepthandDurationEventMulti)
 	if err != nil {
 		panic(err)
 	}

structures/structure.go

@@ -135,10 +135,6 @@ func (s StructureDeterministic) Compute(d hazards.HazardEvent) (consequences.Res
 	return computeConsequences(d, s)
 }
 
-func (s StructureDeterministic) Compute2(d hazards.MultiHazardEvent) {
-	fmt.Println("Delete this function")
-}
-
 // Compute implements the consequences.Receptor interface on StrucutreDeterminstic
 func (s StructureDeterministic) Clone() StructureDeterministic {
 	return StructureDeterministic{
@@ -659,6 +655,20 @@ func computeConsequencesMultiHazard(event hazards.MultiHazardEvent, s StructureD
 		subResultsHeader = append(subResultsHeader, fmt.Sprintf("%d", event.Index()))
 		subResultsResult = append(subResultsResult, result)
 		subResult = consequences.Result{Headers: subResultsHeader, Result: subResultsResult}
+		ret.Result[0] = s.BaseStructure.Name
+		ret.Result[1] = s.BaseStructure.X
+		ret.Result[2] = s.BaseStructure.Y
+		ret.Result[3] = s.BaseStructure.DamCat
+		ret.Result[4] = s.OccType.Name
+		ret.Result[5] = s.Pop2amu65
+		ret.Result[6] = s.Pop2amo65
+		ret.Result[7] = s.Pop2pmu65
+		ret.Result[8] = s.Pop2pmo65
+		ret.Result[9] = s.CBFips
+		ret.Result[10] = sval
+		ret.Result[11] = conval
+		ret.Result[12] = svalcurr
+		ret.Result[13] = convalcurr
 		ret.Result[20] = subResult
 
 		if event.HasNext() {