Revert "Small changes (#51)"

This reverts commit d3da9d4.

config/config_types.go

@@ -36,7 +36,6 @@ type baseOptions struct {
 	AddressChangeThreshold          int           `yaml:"AddressChangeThreshold"`
 	OriginatorShuffleProbability    float32       `yaml:"OriginatorShuffleProbability"`
 	NonOriginatorShuffleProbability float32       `yaml:"NonOriginatorShuffleProbability"`
-	ShufflingPeriod                 int           `yaml:"ShufflingPeriod"`
 	AddressRange                    int
 	StorageDepth                    int
 }

config/default_variables.go

@@ -29,7 +29,6 @@ func getDefaultConfig() Config {
 			AddressChangeThreshold:          0,         // non-positive means no limit
 			OriginatorShuffleProbability:    0.0,       // 0.0
 			NonOriginatorShuffleProbability: 0.0,       // 0.0
-			ShufflingPeriod:                 0,         // 0
 			ReplicationFactor:               4,
 			AdjustableThresholdExponent:     3,
 			OutputOptions: outputOptions{

config/get_variables.go

@@ -47,10 +47,6 @@ func GetNonOriginatorShuffleProbability() float32 {
 	return theconfig.BaseOptions.NonOriginatorShuffleProbability
 }
 
-func GetShufflingPeriod() int {
-	return theconfig.BaseOptions.ShufflingPeriod
-}
-
 func IsForgivenessEnabled() bool {
 	return theconfig.ExperimentOptions.ForgivenessEnabled
 }

model/parts/types/network.go

@@ -147,7 +147,6 @@ func (network *Network) node(nodeId NodeId) *Node {
 			RerouteMutex: &sync.Mutex{},
 		},
 		AdjLock: sync.RWMutex{},
-		CreationEpoch: 0,
 	}
 	if len(network.NodesMap) == 0 {
 		network.NodesMap = make(map[NodeId]*Node)

model/parts/types/node.go

@@ -20,7 +20,6 @@ type Node struct {
 	PendingStruct    PendingStruct
 	RerouteStruct    RerouteStruct
 	AdjLock          sync.RWMutex
-	CreationEpoch    int
 }
 
 // Adds a one-way connection from node to other

model/parts/types/types.go

@@ -60,15 +60,13 @@ func (s *State) GetOriginatorId(originatorIndex int) NodeId {
 		if node == nil {
 			panic("Node not found")
 		}
-		if node.CreationEpoch + config.GetShufflingPeriod() <= s.Epoch {
-
+		if node.OriginatorStruct.RequestCount > config.GetAddressChangeThreshold() {
 			newNode, err := s.Graph.NewNode()
 			if err != nil {
 				panic(err)
 			}
 			// The new node is not going to get requests
 			newNode.Deactivate()
-			newNode.CreationEpoch = s.Epoch
 			s.Originators[originatorIndex] = newNode.Id
 		}
 	}

model/parts/update/update_graph.go

@@ -21,26 +21,28 @@ func Graph(state *types.State, requestResult types.RequestResult, curTimeStep in
 				edgeData1 := state.Graph.GetEdgeData(payment.FirstNodeId, payment.PayNextId)
 				edgeData2 := state.Graph.GetEdgeData(payment.PayNextId, payment.FirstNodeId)
 				price := utils.PeerPriceChunk(payment.PayNextId, payment.ChunkId)
-				actualPrice := price
+				actualPrice := edgeData1.A2B - edgeData2.A2B + price
+				if config.IsPayOnlyForCurrentRequest() {
+					actualPrice = price
+				}
 				if actualPrice < 0 {
 					continue
 				} else {
 					if !config.IsPayOnlyForCurrentRequest() {
-						actualPrice = edgeData1.A2B - edgeData2.A2B + price
 						newEdgeData1 := edgeData1
 						newEdgeData1.A2B = 0
 						state.Graph.SetEdgeData(payment.FirstNodeId, payment.PayNextId, newEdgeData1)
 
 						newEdgeData2 := edgeData2
 						newEdgeData2.A2B = 0
 						state.Graph.SetEdgeData(payment.PayNextId, payment.FirstNodeId, newEdgeData2)
+					} else {
+						// Important fix: Reduce debt here, since it debt will be added again below.
+						// Idea is, paying for the current request should not effect the edge balance.
+						newEdgeData1 := edgeData1
+						newEdgeData1.A2B = edgeData1.A2B - price
+						state.Graph.SetEdgeData(payment.FirstNodeId, payment.PayNextId, newEdgeData1)
 					}
-					// Important fix: Reduce debt here, since it debt will be added again below.
-					// Idea is, paying for the current request with or without the rest of debt
-					// should not effect the edge balance.
-					newEdgeData1 := edgeData1
-					newEdgeData1.A2B = edgeData1.A2B - price
-					state.Graph.SetEdgeData(payment.FirstNodeId, payment.PayNextId, newEdgeData1)
 				}
 				// fmt.Println("Payment from ", payment.FirstNodeId, " to ", payment.PayNextId, " for chunk ", payment.ChunkId, " with price ", actualPrice)
 				paymentWithPrice = types.PaymentWithPrice{Payment: payment, Price: actualPrice}

model/parts/update/update_neighbors.go

@@ -7,13 +7,6 @@ import (
 )
 
 func Neighbors(globalState *types.State) bool {
-	if config.GetShufflingPeriod() <= 0 {
-		return true
-	}
-	if globalState.Epoch%config.GetShufflingPeriod() != 0 {
-		return true
-	}
-
 	// Update neighbors with probability p
 	if config.GetOriginatorShuffleProbability() <= 0 && config.GetNonOriginatorShuffleProbability() <= 0 {
 		return true