..

ArinWarev1/Calculator/Result/C1차소요량.vb

@@ -95,7 +95,41 @@
         End Get
     End Property
 
+
+#Region "신재생"
+
+    'ReadOnly Property 신재생_난방_소요량() As Decimal
+    '    Get
+    '        If MIdx = 0 Then
+
+
+
+    '            Try
+    '                Dim a As Decimal = Result.생산E(0).태양광전력생산량
+    '                Dim b As Decimal = Result.생산E(0).풍력전력생산량
+    '                Dim c As Decimal = Result.생산E(0).열병합전력생산량
+    '                Dim sumdata As Decimal = a + b + c
+
+    '                Dim 난방비율 As Decimal = Me.난방전력 / (Me.난방전력 + Me.냉방전력 + Me.급탕전력 + Me.조명전력 + Me.환기전력)
+
+    '                Return 난방비율 * sumdata
+    '            Catch ex As Exception
+
+    '            End Try
+
+    '        Else
+    '            Return 조명전력 * Result.E변환계수.전력
+    '        End If
+    '    End Get
+    'End Property
+
+#End Region
+
+
 #Region "난방"
+
+  
+
     ReadOnly Property 난방소요량() As Decimal
         Get
             If MIdx = 0 Then
@@ -147,7 +181,7 @@
                     End Try
                 End If
 
-                
+
             Else
 
 
@@ -694,6 +728,9 @@
 #End Region
 
 #Region "조명부분(읽기전용)"
+
+    
+
     ReadOnly Property 조명소요량() As Decimal
         Get
             If MIdx = 0 Then